From c07d23dada4ebd9782c8af5e2d08b574ba2ed2ac Mon Sep 17 00:00:00 2001 From: dylangrafmyre Date: Thu, 15 Oct 2015 20:33:29 -1000 Subject: [PATCH] Update docker-compose.yml for new image Delete Dockerfile Set proper scss directory for scss-lint Set :scss_lint to lint proper dummy directory Add dockerignore file for not add certain files/directories to shared volume --- .dockerignore | 2 ++ .scss-lint.yml | 3 +-- Rakefile | 4 ++-- docker-compose.yml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..27fbf8b41 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +coverage/ +docker-compose.yml diff --git a/.scss-lint.yml b/.scss-lint.yml index 52b2a8544..89280ce82 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -1,8 +1,7 @@ # See http://sass-guidelin.es/#zeros scss_files: - - 'app/assets/stylesheets/**/*.scss' - - 'client/assets/stylesheets/**/*.scss' + - 'spec/dummy/app/assets/stylesheets/**/*.scss' linters: # BangFormat: diff --git a/Rakefile b/Rakefile index 7b5b218d4..ac56c9e95 100644 --- a/Rakefile +++ b/Rakefile @@ -50,7 +50,7 @@ namespace :lint do desc "Run scss-lint as shell" task :scss do - sh "scss-lint ." + sh "scss-lint spec/dummy/app/assets/stylesheets/" end desc "Run eslint as shell" @@ -64,7 +64,7 @@ namespace :lint do end desc "Run all eslint, jscs, rubocop linters. Skip ruby-lint and scss" - task lint: [:eslint, :jscs, :rubocop] do + task lint: [:eslint, :jscs, :rubocop, :scss] do puts "Completed all linting" end end diff --git a/docker-compose.yml b/docker-compose.yml index b77180b0e..1742c636b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ lint: - build: . + image: dylangrafmyre/docker-lint working_dir: /app/ volumes: - '.:/app/'