Skip to content

Commit

Permalink
decrease sidekiq version
Browse files Browse the repository at this point in the history
  • Loading branch information
yamax2 committed Jul 11, 2020
1 parent 8907843 commit e0a2e3e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ gem 'redis-mutex', '>= 4'
gem 'russian'
gem 'strip_attributes', '>= 1.8'

gem 'sidekiq', '>= 6'
# waiting for https://github.com/sensortower/sidekiq-throttled/pull/85
gem 'sidekiq', '>= 6', '< 6.1'
gem 'sidekiq-cron', '>= 1.1'
gem 'sidekiq-failures', '>= 1'
gem 'sidekiq-throttled', '>= 0.10'
Expand Down
9 changes: 6 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ GEM
nio4r (~> 2.0)
raabro (1.3.1)
rack (2.2.3)
rack-protection (2.0.8.1)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.4.3)
Expand Down Expand Up @@ -318,10 +320,11 @@ GEM
tilt
shoulda-matchers (4.3.0)
activesupport (>= 4.2.0)
sidekiq (6.1.0)
sidekiq (6.0.7)
connection_pool (>= 2.2.2)
rack (~> 2.0)
redis (>= 4.2.0)
rack-protection (>= 2.0.0)
redis (>= 4.1.0)
sidekiq-cron (1.2.0)
fugit (~> 1.1)
sidekiq (>= 4.2.1)
Expand Down Expand Up @@ -429,7 +432,7 @@ DEPENDENCIES
russian
sass-rails (~> 5.0)
shoulda-matchers
sidekiq (>= 6)
sidekiq (>= 6, < 6.1)
sidekiq-cron (>= 1.1)
sidekiq-failures (>= 1)
sidekiq-throttled (>= 0.10)
Expand Down
3 changes: 2 additions & 1 deletion docker/photostorage/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,16 @@ RUN bundle config set without 'development test production'
FROM base AS builder
RUN apk add --update --no-cache build-base
RUN bundle install
RUN bundle exec rails assets:precompile

FROM base

COPY --from=builder /photostorage/vendor/bundle /photostorage/vendor/bundle
COPY --from=builder /usr/local/bundle/config /usr/local/bundle/config
COPY --from=builder /photostorage/public/assets /photostorage/public/assets
RUN mkdir -p /photostorage/log

ENV RAILS_LOG_TO_STDOUT true
RUN bundle exec rails assets:precompile

EXPOSE 3000
CMD bundle exec rails db:create && bundle exec rails db:migrate && bundle exec rails s -p 3000 -b 0.0.0.0

0 comments on commit e0a2e3e

Please sign in to comment.