Skip to content

Commit 0b20c60

Browse files
Upgrade Rails to 7.1.x and update dependencies
1 parent 0c1d564 commit 0b20c60

4 files changed

Lines changed: 134 additions & 88 deletions

File tree

Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ RUN mkdir -p /opt/app \
2929
# ------------------------------------------------------------
3030
# Install packages common to dev and prod.
3131

32-
# Get list of available packages
33-
RUN apt-get update -qq
34-
3532
# Install standard packages from the Debian repository
36-
RUN apt-get install -y --no-install-recommends \
33+
RUN apt-get update -qq && apt-get install -y --no-install-recommends \
3734
libpq-dev \
38-
libvips42
35+
libvips42 \
36+
libyaml-dev \
37+
pkg-config \
38+
&& rm -rf /var/lib/apt/lists/*
3939

4040
# ------------------------------------------------------------
4141
# Run configuration
@@ -75,10 +75,11 @@ FROM base AS development
7575
USER root
7676

7777
# Install system packages needed to build gems with C extensions.
78-
RUN apt-get install -y --no-install-recommends \
78+
RUN apt-get update -qq && apt-get install -y --no-install-recommends \
7979
gcc \
8080
g++ \
81-
make
81+
make \
82+
&& rm -rf /var/lib/apt/lists/*
8283

8384
# ------------------------------------------------------------
8485
# Install Ruby gems

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ gem 'pg', '~> 1.4'
1818
gem 'pg_search', '~> 2.3'
1919
gem 'puma', '~> 5.0'
2020
gem 'rack-cors'
21-
gem 'rails', '~> 7.0.4'
22-
gem 'ransack', '~> 2.6'
21+
gem 'rails', '~> 7.1.0'
22+
gem 'ransack', '~> 4.2'
2323
gem 'zaru', '~> 0.3.0'
2424

2525
group :development, :test do

Gemfile.lock

Lines changed: 112 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,78 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.0.10)
5-
actionpack (= 7.0.10)
6-
activesupport (= 7.0.10)
4+
actioncable (7.1.6)
5+
actionpack (= 7.1.6)
6+
activesupport (= 7.1.6)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (7.0.10)
10-
actionpack (= 7.0.10)
11-
activejob (= 7.0.10)
12-
activerecord (= 7.0.10)
13-
activestorage (= 7.0.10)
14-
activesupport (= 7.0.10)
9+
zeitwerk (~> 2.6)
10+
actionmailbox (7.1.6)
11+
actionpack (= 7.1.6)
12+
activejob (= 7.1.6)
13+
activerecord (= 7.1.6)
14+
activestorage (= 7.1.6)
15+
activesupport (= 7.1.6)
1516
mail (>= 2.7.1)
1617
net-imap
1718
net-pop
1819
net-smtp
19-
actionmailer (7.0.10)
20-
actionpack (= 7.0.10)
21-
actionview (= 7.0.10)
22-
activejob (= 7.0.10)
23-
activesupport (= 7.0.10)
20+
actionmailer (7.1.6)
21+
actionpack (= 7.1.6)
22+
actionview (= 7.1.6)
23+
activejob (= 7.1.6)
24+
activesupport (= 7.1.6)
2425
mail (~> 2.5, >= 2.5.4)
2526
net-imap
2627
net-pop
2728
net-smtp
28-
rails-dom-testing (~> 2.0)
29-
actionpack (7.0.10)
30-
actionview (= 7.0.10)
31-
activesupport (= 7.0.10)
29+
rails-dom-testing (~> 2.2)
30+
actionpack (7.1.6)
31+
actionview (= 7.1.6)
32+
activesupport (= 7.1.6)
33+
cgi
34+
nokogiri (>= 1.8.5)
3235
racc
33-
rack (~> 2.0, >= 2.2.4)
36+
rack (>= 2.2.4)
37+
rack-session (>= 1.0.1)
3438
rack-test (>= 0.6.3)
35-
rails-dom-testing (~> 2.0)
36-
rails-html-sanitizer (~> 1.0, >= 1.2.0)
37-
actiontext (7.0.10)
38-
actionpack (= 7.0.10)
39-
activerecord (= 7.0.10)
40-
activestorage (= 7.0.10)
41-
activesupport (= 7.0.10)
39+
rails-dom-testing (~> 2.2)
40+
rails-html-sanitizer (~> 1.6)
41+
actiontext (7.1.6)
42+
actionpack (= 7.1.6)
43+
activerecord (= 7.1.6)
44+
activestorage (= 7.1.6)
45+
activesupport (= 7.1.6)
4246
globalid (>= 0.6.0)
4347
nokogiri (>= 1.8.5)
44-
actionview (7.0.10)
45-
activesupport (= 7.0.10)
48+
actionview (7.1.6)
49+
activesupport (= 7.1.6)
4650
builder (~> 3.1)
47-
erubi (~> 1.4)
48-
rails-dom-testing (~> 2.0)
49-
rails-html-sanitizer (~> 1.1, >= 1.2.0)
50-
activejob (7.0.10)
51-
activesupport (= 7.0.10)
51+
cgi
52+
erubi (~> 1.11)
53+
rails-dom-testing (~> 2.2)
54+
rails-html-sanitizer (~> 1.6)
55+
activejob (7.1.6)
56+
activesupport (= 7.1.6)
5257
globalid (>= 0.3.6)
53-
activemodel (7.0.10)
54-
activesupport (= 7.0.10)
55-
activerecord (7.0.10)
56-
activemodel (= 7.0.10)
57-
activesupport (= 7.0.10)
58-
activestorage (7.0.10)
59-
actionpack (= 7.0.10)
60-
activejob (= 7.0.10)
61-
activerecord (= 7.0.10)
62-
activesupport (= 7.0.10)
58+
activemodel (7.1.6)
59+
activesupport (= 7.1.6)
60+
activerecord (7.1.6)
61+
activemodel (= 7.1.6)
62+
activesupport (= 7.1.6)
63+
timeout (>= 0.4.0)
64+
activestorage (7.1.6)
65+
actionpack (= 7.1.6)
66+
activejob (= 7.1.6)
67+
activerecord (= 7.1.6)
68+
activesupport (= 7.1.6)
6369
marcel (~> 1.0)
64-
mini_mime (>= 1.1.0)
65-
activesupport (7.0.10)
70+
activesupport (7.1.6)
6671
base64
6772
benchmark (>= 0.3)
6873
bigdecimal
6974
concurrent-ruby (~> 1.0, >= 1.0.2)
75+
connection_pool (>= 2.2.5)
7076
drb
7177
i18n (>= 1.6, < 2)
7278
logger (>= 1.4.2)
@@ -99,7 +105,7 @@ GEM
99105
berkeley_library-logging (~> 0.3)
100106
rest-client (~> 2.1)
101107
typesafe_enum (~> 0.3)
102-
bigdecimal (3.2.2)
108+
bigdecimal (4.0.1)
103109
brakeman (7.1.0)
104110
racc
105111
builder (3.3.0)
@@ -108,8 +114,10 @@ GEM
108114
bundler-audit (0.9.2)
109115
bundler (>= 1.2.0, < 3)
110116
thor (~> 1.0)
117+
cgi (0.5.1)
111118
colorize (1.1.0)
112119
concurrent-ruby (1.3.6)
120+
connection_pool (3.0.2)
113121
crack (1.0.0)
114122
bigdecimal
115123
rexml
@@ -123,6 +131,7 @@ GEM
123131
docile (1.4.1)
124132
domain_name (0.6.20240107)
125133
drb (2.2.3)
134+
erb (6.0.2)
126135
erubi (1.13.1)
127136
factory_bot (6.5.5)
128137
activesupport (>= 6.1.0)
@@ -145,6 +154,12 @@ GEM
145154
image_processing (1.14.0)
146155
mini_magick (>= 4.9.5, < 6)
147156
ruby-vips (>= 2.0.17, < 3)
157+
io-console (0.8.2)
158+
irb (1.17.0)
159+
pp (>= 0.6.0)
160+
prism (>= 1.3.0)
161+
rdoc (>= 4.0.0)
162+
reline (>= 0.4.2)
148163
jsonapi-serializer (2.2.0)
149164
activesupport (>= 4.2)
150165
jsonapi.rb (2.1.1)
@@ -171,7 +186,6 @@ GEM
171186
nokogiri (~> 1.0)
172187
rexml
173188
marcel (1.1.0)
174-
method_source (1.1.0)
175189
mime-types (3.7.0)
176190
logger
177191
mime-types-data (~> 3.2025, >= 3.2025.0507)
@@ -180,7 +194,9 @@ GEM
180194
logger
181195
mini_mime (1.1.5)
182196
mini_portile2 (2.8.9)
183-
minitest (5.27.0)
197+
minitest (6.0.2)
198+
drb (~> 2.0)
199+
prism (~> 1.5)
184200
mutex_m (0.3.0)
185201
net-imap (0.6.3)
186202
date
@@ -227,30 +243,41 @@ GEM
227243
pg_search (2.3.7)
228244
activerecord (>= 6.1)
229245
activesupport (>= 6.1)
230-
prism (1.4.0)
246+
pp (0.6.3)
247+
prettyprint
248+
prettyprint (0.2.0)
249+
prism (1.9.0)
250+
psych (5.3.1)
251+
date
252+
stringio
231253
public_suffix (6.0.2)
232254
puma (5.6.9)
233255
nio4r (~> 2.0)
234256
racc (1.8.1)
235257
rack (2.2.22)
236258
rack-cors (2.0.2)
237259
rack (>= 2.0.0)
260+
rack-session (1.0.2)
261+
rack (< 3)
238262
rack-test (2.2.0)
239263
rack (>= 1.3)
240-
rails (7.0.10)
241-
actioncable (= 7.0.10)
242-
actionmailbox (= 7.0.10)
243-
actionmailer (= 7.0.10)
244-
actionpack (= 7.0.10)
245-
actiontext (= 7.0.10)
246-
actionview (= 7.0.10)
247-
activejob (= 7.0.10)
248-
activemodel (= 7.0.10)
249-
activerecord (= 7.0.10)
250-
activestorage (= 7.0.10)
251-
activesupport (= 7.0.10)
264+
rackup (1.0.1)
265+
rack (< 3)
266+
webrick
267+
rails (7.1.6)
268+
actioncable (= 7.1.6)
269+
actionmailbox (= 7.1.6)
270+
actionmailer (= 7.1.6)
271+
actionpack (= 7.1.6)
272+
actiontext (= 7.1.6)
273+
actionview (= 7.1.6)
274+
activejob (= 7.1.6)
275+
activemodel (= 7.1.6)
276+
activerecord (= 7.1.6)
277+
activestorage (= 7.1.6)
278+
activesupport (= 7.1.6)
252279
bundler (>= 1.15.0)
253-
railties (= 7.0.10)
280+
railties (= 7.1.6)
254281
rails-controller-testing (1.0.5)
255282
actionpack (>= 5.0.1.rc1)
256283
actionview (>= 5.0.1.rc1)
@@ -262,20 +289,29 @@ GEM
262289
rails-html-sanitizer (1.7.0)
263290
loofah (~> 2.25)
264291
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
265-
railties (7.0.10)
266-
actionpack (= 7.0.10)
267-
activesupport (= 7.0.10)
268-
method_source
292+
railties (7.1.6)
293+
actionpack (= 7.1.6)
294+
activesupport (= 7.1.6)
295+
cgi
296+
irb
297+
rackup (>= 1.0.0)
269298
rake (>= 12.2)
270-
thor (~> 1.0)
271-
zeitwerk (~> 2.5)
299+
thor (~> 1.0, >= 1.2.2)
300+
tsort (>= 0.2)
301+
zeitwerk (~> 2.6)
272302
rainbow (3.1.1)
273303
rake (13.3.1)
274-
ransack (2.6.0)
275-
activerecord (>= 6.0.4)
276-
activesupport (>= 6.0.4)
304+
ransack (4.4.0)
305+
activerecord (>= 7.1)
306+
activesupport (>= 7.1)
277307
i18n
308+
rdoc (7.2.0)
309+
erb
310+
psych (>= 4.0.0)
311+
tsort
278312
regexp_parser (2.11.2)
313+
reline (0.6.3)
314+
io-console (~> 0.5)
279315
request_store (1.7.0)
280316
rack (>= 1.4)
281317
rest-client (2.1.0)
@@ -343,8 +379,10 @@ GEM
343379
simplecov-rcov (0.3.7)
344380
simplecov (>= 0.4.1)
345381
simplecov_json_formatter (0.1.4)
382+
stringio (3.2.0)
346383
thor (1.5.0)
347384
timeout (0.6.1)
385+
tsort (0.2.0)
348386
typesafe_enum (0.3.1)
349387
tzinfo (2.0.6)
350388
concurrent-ruby (~> 1.0)
@@ -353,6 +391,7 @@ GEM
353391
addressable (>= 2.8.0)
354392
crack (>= 0.3.2)
355393
hashdiff (>= 0.4.0, < 2.0.0)
394+
webrick (1.9.2)
356395
websocket-driver (0.8.0)
357396
base64
358397
websocket-extensions (>= 0.1.0)
@@ -388,9 +427,9 @@ DEPENDENCIES
388427
pg_search (~> 2.3)
389428
puma (~> 5.0)
390429
rack-cors
391-
rails (~> 7.0.4)
430+
rails (~> 7.1.0)
392431
rails-controller-testing
393-
ransack (~> 2.6)
432+
ransack (~> 4.2)
394433
rspec (~> 3.10)
395434
rspec-rails (~> 5.0)
396435
rspec_junit_formatter (~> 0.5)

0 commit comments

Comments
 (0)