Skip to content

Commit

Permalink
Update passenger and sidekiq
Browse files Browse the repository at this point in the history
  • Loading branch information
bbpennel committed Oct 17, 2024
1 parent 4cf250d commit 2382ae2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ COPY docker/CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo
RUN yum -y update \
&& yum -y install epel-release \
&& yum -y install centos-release-scl-rh centos-release-scl \
&& yum -y install libyaml libyaml-devel \
&& yum -y --enablerepo=centos-sclo-rh install rh-ruby30 rh-ruby30-ruby-devel \
&& yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \
&& yum -y install gcc gcc-c++ zlib-devel devtoolset-8 postgresql14 libpq5-devel libxslt-devel \
Expand Down
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ gem 'nokogiri', '~>1.14.2'
gem 'omniauth', '~> 2.0'
gem 'omniauth-rails_csrf_protection'
gem 'omniauth-shibboleth', '~> 1.3'
gem 'passenger', '6.0.14', require: 'phusion_passenger/rack_handler'
# Cannot use 6.0.23 because it adds rackup as a dependency, which leads to conflicts for now
gem 'passenger', '6.0.22', require: 'phusion_passenger/rack_handler'
# Use postgresql as the database for Active Record
gem 'pg', '~> 1.3.5'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
Expand All @@ -59,7 +60,7 @@ gem 'roo', '~>2.9.0'
gem 'rsolr', '~> 2.5.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 6.0.0'
gem 'sidekiq', '~> 6.5'
gem 'sidekiq', '~> 7.3'
gem 'sidekiq-status', '~> 3.0.0'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5.2.1'
Expand Down
18 changes: 11 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ GEM
ast (~> 2.4.1)
racc
parslet (2.0.0)
passenger (6.0.14)
passenger (6.0.22)
rack
rake (>= 0.8.1)
pg (1.3.5)
Expand Down Expand Up @@ -829,6 +829,8 @@ GEM
redic (1.5.3)
hiredis
redis (4.5.1)
redis-client (0.22.2)
connection_pool
redis-namespace (1.11.0)
redis (>= 4)
redlock (1.3.2)
Expand Down Expand Up @@ -953,10 +955,12 @@ GEM
sxp (~> 1.1)
shoulda-matchers (5.3.0)
activesupport (>= 5.2.0)
sidekiq (6.5.12)
connection_pool (>= 2.2.5, < 3)
rack (~> 2.0)
redis (>= 4.5.0, < 5)
sidekiq (7.3.2)
concurrent-ruby (< 2)
connection_pool (>= 2.3.0)
logger
rack (>= 2.2.4)
redis-client (>= 0.22.2)
sidekiq-status (3.0.3)
chronic_duration
sidekiq (>= 6.0, < 8)
Expand Down Expand Up @@ -1123,7 +1127,7 @@ DEPENDENCIES
omniauth (~> 2.0)
omniauth-rails_csrf_protection
omniauth-shibboleth (~> 1.3)
passenger (= 6.0.14)
passenger (= 6.0.22)
pg (~> 1.3.5)
puma
rails (~> 6.0)
Expand All @@ -1142,7 +1146,7 @@ DEPENDENCIES
sass-rails (~> 6.0.0)
selenium-webdriver (~> 4.8)
shoulda-matchers (~> 5.3.0)
sidekiq (~> 6.5)
sidekiq (~> 7.3)
sidekiq-status (~> 3.0.0)
simplecov
solr_wrapper (~> 4.0.2)
Expand Down

0 comments on commit 2382ae2

Please sign in to comment.