Skip to content

Commit

Permalink
Merge pull request #1898 from DFE-Digital/upgrade-ruby
Browse files Browse the repository at this point in the history
Upgrade to Ruby 3.3.0
  • Loading branch information
thomasleese authored Jan 8, 2024
2 parents c586e39 + 7f334d7 commit bf912ac
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 15 deletions.
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
.prettierignore
.rladr
.rspec
.ruby-version
.tool-versions
Dockerfile
LICENCE
Expand Down
1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ azure-cli 2.51.0
kubectl 1.27.3
nodejs 18.1.0
postgres 14.9
ruby 3.2.2
ruby 3.3.0
terraform 1.5.0
yarn 1.22.19
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# production: runs the actual app

# Build builder image
FROM ruby:3.2.2-alpine as builder
FROM ruby:3.3.0-alpine as builder

WORKDIR /app

Expand All @@ -23,7 +23,7 @@ RUN apk upgrade --no-cache openssl libssl3 libcrypto3 curl
RUN apk add --update --no-cache build-base yarn postgresql14-dev git vips-dev

# Install gems defined in Gemfile
COPY .ruby-version Gemfile Gemfile.lock ./
COPY Gemfile Gemfile.lock ./

# Install gems and remove gem cache
RUN bundler -v && \
Expand Down Expand Up @@ -60,7 +60,7 @@ RUN rm -rf node_modules log/* tmp/* /tmp && \
find /usr/local/bundle/gems -name "*.html" -delete

# Build runtime image
FROM ruby:3.2.2-alpine as production
FROM ruby:3.3.0-alpine as production

# The application runs from /app
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.2.2"
ruby "3.3.0"

gem "rails", "7.1.2"

Expand Down
20 changes: 12 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ GIT
GEM
remote: https://rubygems.org/
specs:
abbrev (0.1.2)
actioncable (7.1.2)
actionpack (= 7.1.2)
activesupport (= 7.1.2)
Expand Down Expand Up @@ -139,7 +140,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
cgi (0.3.6)
cgi (0.4.1)
climate_control (1.2.0)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
Expand Down Expand Up @@ -265,11 +266,11 @@ GEM
govuk_markdown (2.0.1)
activesupport
redcarpet
haml (6.2.3)
haml (6.3.0)
temple (>= 0.8.2)
thor
tilt
hashdiff (1.0.1)
hashdiff (1.1.0)
hashie (5.0.0)
html-attributes-utils (1.0.2)
activesupport (>= 6.1.4.4)
Expand Down Expand Up @@ -306,6 +307,7 @@ GEM
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.20.0)
msgpack (1.7.2)
multi_json (1.15.0)
Expand Down Expand Up @@ -340,7 +342,7 @@ GEM
snaky_hash (~> 2.0)
version_gem (~> 1.1)
okcomputer (1.18.5)
omniauth (2.1.1)
omniauth (2.1.2)
hashie (>= 3.4.6)
rack (>= 2.2.3)
rack-protection
Expand Down Expand Up @@ -422,7 +424,8 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.1.0)
rbs (3.2.2)
rbs (3.4.1)
abbrev
rdoc (6.6.2)
psych (>= 4.0.0)
redcarpet (3.6.0)
Expand Down Expand Up @@ -508,7 +511,7 @@ GEM
concurrent-ruby (~> 1.0, >= 1.0.2)
shoulda-matchers (6.0.0)
activesupport (>= 5.2.0)
sidekiq (6.5.11)
sidekiq (6.5.12)
connection_pool (>= 2.2.5, < 3)
rack (~> 2.0)
redis (>= 4.5.0, < 5)
Expand Down Expand Up @@ -555,7 +558,7 @@ GEM
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unf_ext (0.0.9.1)
unicode-display_width (2.5.0)
validate_url (1.0.15)
activemodel (>= 3.0.0)
Expand Down Expand Up @@ -587,6 +590,7 @@ GEM
PLATFORMS
arm64-darwin-21
arm64-darwin-22
arm64-darwin-23
x86_64-darwin-21
x86_64-darwin-22
x86_64-linux
Expand Down Expand Up @@ -652,7 +656,7 @@ DEPENDENCIES
webmock

RUBY VERSION
ruby 3.2.2p53
ruby 3.3.0p0

BUNDLED WITH
2.4.10

0 comments on commit bf912ac

Please sign in to comment.