Browse Source

Bump ruby and rails minor versions (#197)

pull/198/head
baarkerlounger 3 years ago committed by GitHub
parent
commit
c118a7af51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .ruby-version
  2. 4
      Dockerfile
  3. 4
      Gemfile
  4. 145
      Gemfile.lock

2
.ruby-version

@ -1 +1 @@
3.0.3 3.1.0

4
Dockerfile

@ -1,5 +1,5 @@
# Build compilation image # Build compilation image
FROM ruby:3.0.3-alpine3.14 as builder FROM ruby:3.1.0-alpine3.14 as builder
# The application runs from /app # The application runs from /app
WORKDIR /app WORKDIR /app
@ -45,7 +45,7 @@ RUN rm -rf node_modules log tmp && \
find /usr/local/bundle/gems -name "*.html" -delete find /usr/local/bundle/gems -name "*.html" -delete
# Build runtime image # Build runtime image
FROM ruby:3.0.3-alpine as production FROM ruby:3.1.0-alpine as production
# The application runs from /app # The application runs from /app
WORKDIR /app WORKDIR /app

4
Gemfile

@ -3,10 +3,10 @@
source "https://rubygems.org" source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" } git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby "3.0.3" ruby "3.1.0"
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
gem "rails", "~> 7.0.0" gem "rails", "~> 7.0.1"
# Use postgresql as the database for Active Record # Use postgresql as the database for Active Record
gem "pg", "~> 1.1" gem "pg", "~> 1.1"
# Use Puma as the app server # Use Puma as the app server

145
Gemfile.lock

@ -46,61 +46,67 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (7.0.0) actioncable (7.0.1)
actionpack (= 7.0.0) actionpack (= 7.0.1)
activesupport (= 7.0.0) activesupport (= 7.0.1)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (7.0.0) actionmailbox (7.0.1)
actionpack (= 7.0.0) actionpack (= 7.0.1)
activejob (= 7.0.0) activejob (= 7.0.1)
activerecord (= 7.0.0) activerecord (= 7.0.1)
activestorage (= 7.0.0) activestorage (= 7.0.1)
activesupport (= 7.0.0) activesupport (= 7.0.1)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (7.0.0) net-imap
actionpack (= 7.0.0) net-pop
actionview (= 7.0.0) net-smtp
activejob (= 7.0.0) actionmailer (7.0.1)
activesupport (= 7.0.0) actionpack (= 7.0.1)
actionview (= 7.0.1)
activejob (= 7.0.1)
activesupport (= 7.0.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (7.0.0) actionpack (7.0.1)
actionview (= 7.0.0) actionview (= 7.0.1)
activesupport (= 7.0.0) activesupport (= 7.0.1)
rack (~> 2.0, >= 2.2.0) rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.0) actiontext (7.0.1)
actionpack (= 7.0.0) actionpack (= 7.0.1)
activerecord (= 7.0.0) activerecord (= 7.0.1)
activestorage (= 7.0.0) activestorage (= 7.0.1)
activesupport (= 7.0.0) activesupport (= 7.0.1)
globalid (>= 0.6.0) globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (7.0.0) actionview (7.0.1)
activesupport (= 7.0.0) activesupport (= 7.0.1)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.0) activejob (7.0.1)
activesupport (= 7.0.0) activesupport (= 7.0.1)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (7.0.0) activemodel (7.0.1)
activesupport (= 7.0.0) activesupport (= 7.0.1)
activerecord (7.0.0) activerecord (7.0.1)
activemodel (= 7.0.0) activemodel (= 7.0.1)
activesupport (= 7.0.0) activesupport (= 7.0.1)
activestorage (7.0.0) activestorage (7.0.1)
actionpack (= 7.0.0) actionpack (= 7.0.1)
activejob (= 7.0.0) activejob (= 7.0.1)
activerecord (= 7.0.0) activerecord (= 7.0.1)
activesupport (= 7.0.0) activesupport (= 7.0.1)
marcel (~> 1.0) marcel (~> 1.0)
mini_mime (>= 1.1.0) mini_mime (>= 1.1.0)
activesupport (7.0.0) activesupport (7.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
@ -137,6 +143,7 @@ GEM
crass (1.0.6) crass (1.0.6)
deep_merge (1.2.1) deep_merge (1.2.1)
diff-lcs (1.5.0) diff-lcs (1.5.0)
digest (3.1.0)
discard (1.2.1) discard (1.2.1)
activerecord (>= 4.2, < 8) activerecord (>= 4.2, < 8)
docile (1.4.0) docile (1.4.0)
@ -177,6 +184,7 @@ GEM
i18n (1.8.11) i18n (1.8.11)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
iniparse (1.5.0) iniparse (1.5.0)
io-wait (0.2.1)
jquery-rails (4.4.0) jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
@ -209,12 +217,27 @@ GEM
mini_mime (1.1.2) mini_mime (1.1.2)
minitest (5.15.0) minitest (5.15.0)
msgpack (1.4.2) msgpack (1.4.2)
net-imap (0.2.3)
digest
net-protocol
strscan
net-pop (0.1.1)
digest
net-protocol
timeout
net-protocol (0.1.2)
io-wait
timeout
net-smtp (0.3.1)
digest
net-protocol
timeout
nio4r (2.5.8) nio4r (2.5.8)
nokogiri (1.12.5-arm64-darwin) nokogiri (1.13.0-arm64-darwin)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.12.5-x86_64-darwin) nokogiri (1.13.0-x86_64-darwin)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.12.5-x86_64-linux) nokogiri (1.13.0-x86_64-linux)
racc (~> 1.4) racc (~> 1.4)
orm_adapter (0.5.0) orm_adapter (0.5.0)
overcommit (0.58.0) overcommit (0.58.0)
@ -240,32 +263,32 @@ GEM
rack (2.2.3) rack (2.2.3)
rack-mini-profiler (2.3.3) rack-mini-profiler (2.3.3)
rack (>= 1.2.0) rack (>= 1.2.0)
rack-proxy (0.7.0) rack-proxy (0.7.2)
rack rack
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (7.0.0) rails (7.0.1)
actioncable (= 7.0.0) actioncable (= 7.0.1)
actionmailbox (= 7.0.0) actionmailbox (= 7.0.1)
actionmailer (= 7.0.0) actionmailer (= 7.0.1)
actionpack (= 7.0.0) actionpack (= 7.0.1)
actiontext (= 7.0.0) actiontext (= 7.0.1)
actionview (= 7.0.0) actionview (= 7.0.1)
activejob (= 7.0.0) activejob (= 7.0.1)
activemodel (= 7.0.0) activemodel (= 7.0.1)
activerecord (= 7.0.0) activerecord (= 7.0.1)
activestorage (= 7.0.0) activestorage (= 7.0.1)
activesupport (= 7.0.0) activesupport (= 7.0.1)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 7.0.0) railties (= 7.0.1)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2) rails-html-sanitizer (1.4.2)
loofah (~> 2.3) loofah (~> 2.3)
railties (7.0.0) railties (7.0.1)
actionpack (= 7.0.0) actionpack (= 7.0.1)
activesupport (= 7.0.0) activesupport (= 7.0.1)
method_source method_source
rake (>= 12.2) rake (>= 12.2)
thor (~> 1.0) thor (~> 1.0)
@ -357,7 +380,9 @@ GEM
simplecov_json_formatter (0.1.3) simplecov_json_formatter (0.1.3)
stimulus-rails (1.0.2) stimulus-rails (1.0.2)
railties (>= 6.0.0) railties (>= 6.0.0)
strscan (3.0.1)
thor (1.2.1) thor (1.2.1)
timeout (0.2.0)
turbo-rails (1.0.0) turbo-rails (1.0.0)
actionpack (>= 6.0.0) actionpack (>= 6.0.0)
railties (>= 6.0.0) railties (>= 6.0.0)
@ -422,7 +447,7 @@ DEPENDENCIES
pry-byebug pry-byebug
puma (~> 5.0) puma (~> 5.0)
rack-mini-profiler (~> 2.0) rack-mini-profiler (~> 2.0)
rails (~> 7.0.0) rails (~> 7.0.1)
roo roo
rspec-rails rspec-rails
rubocop-govuk rubocop-govuk
@ -439,7 +464,7 @@ DEPENDENCIES
webpacker (~> 5.0) webpacker (~> 5.0)
RUBY VERSION RUBY VERSION
ruby 3.0.3p157 ruby 3.1.0p0
BUNDLED WITH BUNDLED WITH
2.2.32 2.3.3

Loading…
Cancel
Save