Skip to content

Commit

Permalink
Merge pull request #2478 from sonalkr132/move-sassc
Browse files Browse the repository at this point in the history
Replace sass-rails with sassc-rails and don't install in prod image
  • Loading branch information
sonalkr132 committed Oct 6, 2020
2 parents 144857e + 46d8eb6 commit 0414b00
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@ RUN mv /app/config/database.yml.example /app/config/database.yml


RUN gem install bundler io-console --no-ri --no-rdoc && \
bundle config set without 'development test' && \
bundle config set --local without 'development test' && \
bundle install --jobs 20 --retry 5

RUN RAILS_ENV=production RAILS_GROUPS=js SECRET_KEY_BASE=1234 bin/rails assets:precompile
RUN RAILS_ENV=production RAILS_GROUPS=assets SECRET_KEY_BASE=1234 bin/rails assets:precompile

RUN bundle config set --local without 'development test assets' && \
bundle clean --force


FROM ruby:2.6-alpine
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ gem "rbtrace", "~> 0.4.8"
gem "rdoc"
gem "rest-client", require: "rest_client"
gem "roadie-rails"
gem "sass-rails"
gem "shoryuken", "~> 2.1.0", require: false
gem "statsd-instrument", "~> 2.3.0"
gem "unicorn", "~> 5.5.0.1.g6836"
Expand All @@ -46,7 +45,8 @@ gem "unpwn", "~> 0.3.0"
# Logging
gem "lograge"

group :js do
group :assets do
gem "sassc-rails"
gem "uglifier", ">= 1.0.3"
gem "autoprefixer-rails"
end
Expand Down
6 changes: 2 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,7 @@ GEM
ruby-graphviz (1.2.4)
ruby-progressbar (1.10.1)
rubyzip (2.3.0)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.2.1)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
Expand Down Expand Up @@ -458,7 +456,7 @@ DEPENDENCIES
rubocop
rubocop-performance
rubocop-rails
sass-rails
sassc-rails
selenium-webdriver
shoryuken (~> 2.1.0)
shoulda
Expand Down

0 comments on commit 0414b00

Please sign in to comment.