Skip to content

Commit 06c0c5e

Browse files
authored
Upgrade ruby to 3.4.7 (#724)
1 parent caab454 commit 06c0c5e

File tree

3 files changed

+32
-30
lines changed

3 files changed

+32
-30
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.6
1+
3.4.7

Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
### START of FLY ####
44

55
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
6-
ARG RUBY_VERSION=3.3.6
6+
ARG RUBY_VERSION=3.4.7
77
FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-jemalloc-slim as base-for-fly
88

99
LABEL fly_launch_runtime="rails"
@@ -89,10 +89,9 @@ EXPOSE 3000
8989
#### START of DEV ####
9090

9191
# RUBY_VERSION is the only thing used from anything above
92-
FROM ruby:${RUBY_VERSION}-alpine@sha256:caeab43b356463e63f87af54a03de1ae4687b36da708e6d37025c557ade450f8 AS development
93-
# TODO: When we bump to a new version of ruby we'll have to unpin from this specific sha
92+
FROM ruby:${RUBY_VERSION}-alpine AS development
9493

95-
RUN apk add --no-cache bash git build-base postgresql-dev curl-dev gcompat tzdata vips-dev imagemagick
94+
RUN apk add --no-cache bash git build-base postgresql-dev curl-dev gcompat tzdata vips-dev imagemagick yaml-dev
9695

9796
ENV BUNDLE_CACHE=/tmp/bundle \
9897
BUNDLE_JOBS=2 \
@@ -116,7 +115,7 @@ CMD ["./bin/dev"]
116115
# RUBY_VERSION is the only thing used from anything above
117116
FROM ruby:${RUBY_VERSION}-alpine AS render-production
118117

119-
RUN apk add --no-cache git build-base postgresql-dev curl-dev gcompat tzdata vips-dev imagemagick
118+
RUN apk add --no-cache git build-base postgresql-dev curl-dev gcompat tzdata vips-dev imagemagick yaml-dev
120119

121120
WORKDIR /rails
122121
COPY Gemfile Gemfile.lock .ruby-version ./

Gemfile.lock

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ GEM
8383
tins (~> 1.0)
8484
ast (2.4.3)
8585
aws-eventstream (1.4.0)
86-
aws-partitions (1.1166.0)
86+
aws-partitions (1.1174.0)
8787
aws-sdk-core (3.233.0)
8888
aws-eventstream (~> 1, >= 1.3.0)
8989
aws-partitions (~> 1, >= 1.992.0)
@@ -92,10 +92,10 @@ GEM
9292
bigdecimal
9393
jmespath (~> 1, >= 1.6.1)
9494
logger
95-
aws-sdk-kms (1.113.0)
95+
aws-sdk-kms (1.114.0)
9696
aws-sdk-core (~> 3, >= 3.231.0)
9797
aws-sigv4 (~> 1.5)
98-
aws-sdk-s3 (1.199.1)
98+
aws-sdk-s3 (1.200.0)
9999
aws-sdk-core (~> 3, >= 3.231.0)
100100
aws-sdk-kms (~> 1)
101101
aws-sigv4 (~> 1.5)
@@ -104,7 +104,7 @@ GEM
104104
base64 (0.3.0)
105105
bcrypt (3.1.20)
106106
benchmark (0.4.1)
107-
bigdecimal (3.2.3)
107+
bigdecimal (3.3.1)
108108
bindex (0.8.1)
109109
bootsnap (1.18.6)
110110
msgpack (~> 1.2)
@@ -132,14 +132,14 @@ GEM
132132
dockerfile-rails (1.7.10)
133133
rails (>= 3.0.0)
134134
drb (2.2.3)
135-
erb (5.0.2)
135+
erb (5.1.1)
136136
erubi (1.13.1)
137-
et-orbi (1.3.0)
137+
et-orbi (1.4.0)
138138
tzinfo
139139
ethon (0.15.0)
140140
ffi (>= 1.15.0)
141141
event_stream_parser (1.0.0)
142-
faraday (2.13.4)
142+
faraday (2.14.0)
143143
faraday-net_http (>= 2.0, < 3.5)
144144
json
145145
logger
@@ -166,7 +166,7 @@ GEM
166166
base64 (~> 0.2)
167167
faraday (>= 1.0, < 3.a)
168168
google-logging-utils (0.2.0)
169-
googleauth (1.15.0)
169+
googleauth (1.15.1)
170170
faraday (>= 1.0, < 3.a)
171171
google-cloud-env (~> 2.2)
172172
google-logging-utils (~> 0.1)
@@ -191,7 +191,7 @@ GEM
191191
rdoc (>= 4.0.0)
192192
reline (>= 0.4.2)
193193
jmespath (1.6.2)
194-
json (2.15.0)
194+
json (2.15.1)
195195
jwt (2.10.2)
196196
base64
197197
language_server-protocol (3.17.0.5)
@@ -216,7 +216,7 @@ GEM
216216
matrix (0.4.3)
217217
mini_magick (4.13.2)
218218
mini_mime (1.1.5)
219-
minitest (5.25.5)
219+
minitest (5.26.0)
220220
minitest-retry (0.2.5)
221221
minitest (>= 5.0)
222222
minitest-skip (0.0.3)
@@ -232,7 +232,7 @@ GEM
232232
activesupport (>= 5.2.0)
233233
net-http (0.6.0)
234234
uri
235-
net-imap (0.5.10)
235+
net-imap (0.5.12)
236236
date
237237
net-protocol
238238
net-pop (0.1.2)
@@ -262,8 +262,9 @@ GEM
262262
rack (>= 1.2, < 4)
263263
snaky_hash (~> 2.0, >= 2.0.3)
264264
version_gem (~> 1.1, >= 1.1.9)
265-
omniauth (2.1.3)
265+
omniauth (2.1.4)
266266
hashie (>= 3.4.6)
267+
logger
267268
rack (>= 2.2.3)
268269
rack-protection
269270
omniauth-google-oauth2 (1.2.1)
@@ -298,23 +299,23 @@ GEM
298299
postmark-rails (0.22.1)
299300
actionmailer (>= 3.0.0)
300301
postmark (>= 1.21.3, < 2.0)
301-
pp (0.6.2)
302+
pp (0.6.3)
302303
prettyprint
303304
prettyprint (0.2.0)
304-
prism (1.5.1)
305+
prism (1.6.0)
305306
psych (5.2.6)
306307
date
307308
stringio
308309
public_suffix (6.0.2)
309-
puma (7.0.4)
310+
puma (7.1.0)
310311
nio4r (~> 2.0)
311312
raabro (1.4.0)
312313
racc (1.8.1)
313-
rack (3.2.1)
314+
rack (3.2.3)
314315
rack-cors (3.0.0)
315316
logger
316317
rack (>= 3.0.14)
317-
rack-protection (4.1.1)
318+
rack-protection (4.2.1)
318319
base64 (>= 0.1.0)
319320
logger (>= 1.6.0)
320321
rack (>= 3.0.0, < 4)
@@ -363,13 +364,14 @@ GEM
363364
zeitwerk (~> 2.6)
364365
rainbow (3.1.1)
365366
rake (13.3.0)
366-
rdoc (6.14.2)
367+
rdoc (6.15.0)
367368
erb
368369
psych (>= 4.0.0)
370+
tsort
369371
redcarpet (3.6.1)
370372
redis (5.4.1)
371373
redis-client (>= 0.22.0)
372-
redis-client (0.26.0)
374+
redis-client (0.26.1)
373375
connection_pool
374376
regexp_parser (2.11.3)
375377
reline (0.6.2)
@@ -418,9 +420,9 @@ GEM
418420
ruby-vips (2.2.5)
419421
ffi (~> 1.12)
420422
logger
421-
rubyzip (3.1.1)
423+
rubyzip (3.2.0)
422424
securerandom (0.4.1)
423-
selenium-webdriver (4.35.0)
425+
selenium-webdriver (4.37.0)
424426
base64 (~> 0.2)
425427
logger (~> 1.4)
426428
rexml (~> 3.2, >= 3.2.5)
@@ -481,10 +483,11 @@ GEM
481483
tiktoken_ruby (0.0.12-x86_64-linux-musl)
482484
timecop (0.9.10)
483485
timeout (0.4.3)
484-
tins (1.44.1)
486+
tins (1.45.0)
485487
bigdecimal
486488
mize (~> 0.6)
487489
sync
490+
tsort (0.2.0)
488491
turbo-rails (2.0.17)
489492
actionpack (>= 7.1.0)
490493
railties (>= 7.1.0)
@@ -495,7 +498,7 @@ GEM
495498
unicode-display_width (3.2.0)
496499
unicode-emoji (~> 4.1)
497500
unicode-emoji (4.1.0)
498-
uri (1.0.3)
501+
uri (1.0.4)
499502
useragent (0.16.11)
500503
version_gem (1.1.9)
501504
web-console (4.2.1)
@@ -578,7 +581,7 @@ DEPENDENCIES
578581
webmock
579582

580583
RUBY VERSION
581-
ruby 3.3.6p108
584+
ruby 3.4.7p58
582585

583586
BUNDLED WITH
584587
2.6.8

0 commit comments

Comments
 (0)