Skip to content

Commit

Permalink
Merge pull request #797 from datacite/dependency-updates
Browse files Browse the repository at this point in the history 
Update rails to 5.2.7 and supporting packages.  Resolves several secu…
  • Loading branch information
@jrhoads
jrhoads authored Apr 4, 2022
2 parents c1281db + ca3e4a8 commit 16388b0
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 55 deletions.
7 changes: 3 additions & 4 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-full:2.0.0
FROM phusion/passenger-full:2.1.0
LABEL maintainer="[email protected]"

# Set correct environment variables.
Expand All @@ -12,8 +12,8 @@ RUN usermod -a -G docker_env app
# Use baseimage-docker's init process.
CMD ["/sbin/my_init"]

# Use Ruby 2.6.8
RUN bash -lc 'rvm --default use ruby-2.6.8'
# Use Ruby 2.6.9
RUN bash -lc 'rvm --default use ruby-2.6.9'

# Update installed APT packages
RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
Expand Down Expand Up @@ -50,7 +50,6 @@ RUN mkdir -p vendor/bundle && \
chown -R app:app . && \
chmod -R 755 . && \
gem update --system && \
gem install bundler:2.1.4 && \
/sbin/setuser app bundle install --path vendor/bundle

# Copy webapp folder
Expand Down
102 changes: 51 additions & 51 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ GEM
specs:
aasm (5.2.0)
concurrent-ruby (~> 1.0)
actioncable (5.2.6)
actionpack (= 5.2.6)
actioncable (5.2.7)
actionpack (= 5.2.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
actionmailer (5.2.7)
actionpack (= 5.2.7)
actionview (= 5.2.7)
activejob (= 5.2.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.6)
actionview (= 5.2.6)
activesupport (= 5.2.6)
actionpack (5.2.7)
actionview (= 5.2.7)
activesupport (= 5.2.7)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.6)
activesupport (= 5.2.6)
actionview (5.2.7)
activesupport (= 5.2.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -31,20 +31,20 @@ GEM
activemodel (>= 4.1, < 6.2)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (5.2.6)
activesupport (= 5.2.6)
activejob (5.2.7)
activesupport (= 5.2.7)
globalid (>= 0.3.6)
activemodel (5.2.6)
activesupport (= 5.2.6)
activerecord (5.2.6)
activemodel (= 5.2.6)
activesupport (= 5.2.6)
activemodel (5.2.7)
activesupport (= 5.2.7)
activerecord (5.2.7)
activemodel (= 5.2.7)
activesupport (= 5.2.7)
arel (>= 9.0)
activestorage (5.2.6)
actionpack (= 5.2.6)
activerecord (= 5.2.6)
activestorage (5.2.7)
actionpack (= 5.2.7)
activerecord (= 5.2.7)
marcel (~> 1.0.0)
activesupport (5.2.6)
activesupport (5.2.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand Down Expand Up @@ -156,7 +156,7 @@ GEM
colorize (0.8.1)
commonmarker (0.17.13)
ruby-enum (~> 0.5)
concurrent-ruby (1.1.9)
concurrent-ruby (1.1.10)
connection_pool (2.2.5)
countries (2.1.4)
i18n_data (~> 0.8.0)
Expand Down Expand Up @@ -256,8 +256,8 @@ GEM
unicode_utils (>= 1.3.0)
git (1.9.1)
rchardet (~> 1.8)
globalid (0.4.2)
activesupport (>= 4.2.0)
globalid (1.0.0)
activesupport (>= 5.0)
google-protobuf (3.10.0.rc.1)
graphql (1.11.4)
graphql-batch (0.4.3)
Expand All @@ -282,7 +282,7 @@ GEM
http-accept (1.7.0)
http-cookie (1.0.4)
domain_name (~> 0.5)
i18n (1.8.10)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
i18n_data (0.8.0)
iso-639 (0.3.5)
Expand Down Expand Up @@ -337,7 +337,7 @@ GEM
logstash-event (1.2.02)
logstash-logger (0.26.1)
logstash-event (~> 1.2)
loofah (2.12.0)
loofah (2.15.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
macaddr (1.7.2)
Expand All @@ -346,7 +346,7 @@ GEM
mini_mime (>= 0.1.1)
mailgun-ruby (1.2.5)
rest-client (>= 2.0.2)
marcel (1.0.1)
marcel (1.0.2)
maremma (4.9.6)
activesupport (>= 4.2.5)
addressable (>= 2.3.6)
Expand All @@ -365,9 +365,9 @@ GEM
mimemagic (0.3.7)
nokogiri (~> 1.11.2)
mini_magick (4.11.0)
mini_mime (1.1.0)
mini_mime (1.1.2)
mini_portile2 (2.5.3)
minitest (5.14.4)
minitest (5.15.0)
money (6.16.0)
i18n (>= 0.6.4, <= 2)
msgpack (1.4.2)
Expand All @@ -378,7 +378,7 @@ GEM
net-http-persistent (4.0.1)
connection_pool (~> 2.2)
netrc (0.11.0)
nio4r (2.5.7)
nio4r (2.5.8)
nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
Expand Down Expand Up @@ -413,27 +413,27 @@ GEM
rack (>= 1.0, < 3)
rack-utf8_sanitizer (1.7.0)
rack (>= 1.0, < 3.0)
rails (5.2.6)
actioncable (= 5.2.6)
actionmailer (= 5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
activemodel (= 5.2.6)
activerecord (= 5.2.6)
activestorage (= 5.2.6)
activesupport (= 5.2.6)
rails (5.2.7)
actioncable (= 5.2.7)
actionmailer (= 5.2.7)
actionpack (= 5.2.7)
actionview (= 5.2.7)
activejob (= 5.2.7)
activemodel (= 5.2.7)
activerecord (= 5.2.7)
activestorage (= 5.2.7)
activesupport (= 5.2.7)
bundler (>= 1.3.0)
railties (= 5.2.6)
railties (= 5.2.7)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (5.2.6)
actionpack (= 5.2.6)
activesupport (= 5.2.6)
railties (5.2.7)
actionpack (= 5.2.7)
activesupport (= 5.2.7)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
Expand Down Expand Up @@ -573,9 +573,9 @@ GEM
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
string_pattern (2.2.2)
regexp_parser (~> 1.3, >= 1.3.0)
Expand All @@ -589,7 +589,7 @@ GEM
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
test-prof (0.10.2)
thor (1.1.0)
thor (1.2.1)
thread_safe (0.3.6)
tilt (2.0.10)
turnout (2.5.0)
Expand Down Expand Up @@ -727,4 +727,4 @@ DEPENDENCIES
webmock (~> 3.1)

BUNDLED WITH
2.2.33
2.3.10

0 comments on commit 16388b0

Please sign in to comment.