Skip to content

Commit eb069ab

Browse files
committed
bundle update
1 parent 1518140 commit eb069ab

File tree

5 files changed

+64
-45
lines changed

5 files changed

+64
-45
lines changed

.devcontainer/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
2-
ARG RUBY_VERSION=3.3.6
2+
ARG RUBY_VERSION=3.4.1
33
FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION
4+
5+
# Ensure binding is always 0.0.0.0
6+
# Binds the server to all IP addresses of the container, so it can be accessed from outside the container.
7+
ENV BINDING="0.0.0.0"

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html
99

1010
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
11-
ARG RUBY_VERSION=3.3.6
11+
ARG RUBY_VERSION=3.4.1
1212
FROM --platform=$BUILDPLATFORM docker.io/library/ruby:$RUBY_VERSION-slim AS base
1313

1414
# Rails app lives here
@@ -25,6 +25,7 @@ ENV RAILS_ENV="production" \
2525
BUNDLE_PATH="/usr/local/bundle" \
2626
BUNDLE_WITHOUT="development"
2727

28+
2829
# Throw-away build stage to reduce size of final image
2930
FROM base AS build
3031

@@ -47,8 +48,6 @@ COPY . .
4748
RUN bundle exec bootsnap precompile app/ lib/
4849

4950

50-
51-
5251
# Final stage for app image
5352
FROM base
5453

Gemfile.lock

Lines changed: 53 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/rails/rails.git
3-
revision: 6911b00c7c827c853afc535f0bda2b26b1a5fa33
3+
revision: 989561528a11ffdb57819724d51d199d167ce93e
44
branch: main
55
specs:
66
actioncable (8.1.0.alpha)
@@ -110,7 +110,7 @@ GEM
110110
bindex (0.8.1)
111111
bootsnap (1.18.4)
112112
msgpack (~> 1.2)
113-
brakeman (6.2.2)
113+
brakeman (7.0.0)
114114
racc
115115
builder (3.3.0)
116116
capybara (3.40.0)
@@ -122,8 +122,8 @@ GEM
122122
rack-test (>= 0.6.3)
123123
regexp_parser (>= 1.5, < 3.0)
124124
xpath (~> 3.2)
125-
concurrent-ruby (1.3.4)
126-
connection_pool (2.4.1)
125+
concurrent-ruby (1.3.5)
126+
connection_pool (2.5.0)
127127
crass (1.0.6)
128128
date (3.4.1)
129129
debug (1.10.0)
@@ -140,10 +140,11 @@ GEM
140140
raabro (~> 1.4)
141141
globalid (1.2.1)
142142
activesupport (>= 6.1)
143-
i18n (1.14.6)
143+
i18n (1.14.7)
144144
concurrent-ruby (~> 1.0)
145145
io-console (0.8.0)
146-
irb (1.14.3)
146+
irb (1.15.1)
147+
pp (>= 0.6.0)
147148
rdoc (>= 4.0.0)
148149
reline (>= 0.4.2)
149150
json (2.9.1)
@@ -158,10 +159,10 @@ GEM
158159
sshkit (>= 1.23.0, < 2.0)
159160
thor (~> 1.3)
160161
zeitwerk (>= 2.6.18, < 3.0)
161-
keccak (1.3.1)
162-
language_server-protocol (3.17.0.3)
163-
logger (1.6.4)
164-
loofah (2.23.1)
162+
keccak (1.3.2)
163+
language_server-protocol (3.17.0.4)
164+
logger (1.6.5)
165+
loofah (2.24.0)
165166
crass (~> 1.0.2)
166167
nokogiri (>= 1.12.0)
167168
mail (2.8.1)
@@ -175,41 +176,55 @@ GEM
175176
mini_portile2 (2.8.8)
176177
minitest (5.25.4)
177178
msgpack (1.7.5)
178-
net-imap (0.5.4)
179+
net-imap (0.5.5)
179180
date
180181
net-protocol
181182
net-pop (0.1.2)
182183
net-protocol
183184
net-protocol (0.2.2)
184185
timeout
185-
net-scp (4.0.0)
186+
net-scp (4.1.0)
186187
net-ssh (>= 2.6.5, < 8.0.0)
187188
net-sftp (4.0.0)
188189
net-ssh (>= 5.0.0, < 8.0.0)
189190
net-smtp (0.5.0)
190191
net-ssh (7.3.0)
191192
nio4r (2.7.4)
192-
nokogiri (1.17.2)
193+
nokogiri (1.18.2)
193194
mini_portile2 (~> 2.8.2)
194195
racc (~> 1.4)
196+
nokogiri (1.18.2-aarch64-linux-gnu)
197+
racc (~> 1.4)
198+
nokogiri (1.18.2-arm-linux-gnu)
199+
racc (~> 1.4)
200+
nokogiri (1.18.2-arm64-darwin)
201+
racc (~> 1.4)
202+
nokogiri (1.18.2-x86_64-darwin)
203+
racc (~> 1.4)
204+
nokogiri (1.18.2-x86_64-linux-gnu)
205+
racc (~> 1.4)
195206
ostruct (0.6.1)
196207
pagy (9.3.3)
197208
parallel (1.26.3)
198-
parser (3.3.6.0)
209+
parser (3.3.7.0)
199210
ast (~> 2.4.1)
200211
racc
201212
pg (1.5.9)
202-
pkg-config (1.5.8)
203-
psych (5.2.2)
213+
pkg-config (1.5.9)
214+
pp (0.6.2)
215+
prettyprint
216+
prettyprint (0.2.0)
217+
psych (5.2.3)
204218
date
205219
stringio
206220
public_suffix (6.0.1)
207-
puma (6.5.0)
221+
puma (6.6.0)
208222
nio4r (~> 2.0)
209223
raabro (1.4.0)
210224
racc (1.8.1)
211-
rack (3.1.8)
212-
rack-session (2.0.0)
225+
rack (3.1.9)
226+
rack-session (2.1.0)
227+
base64 (>= 0.1.0)
213228
rack (>= 3.0.0)
214229
rack-test (2.2.0)
215230
rack (>= 1.3)
@@ -228,31 +243,31 @@ GEM
228243
mini_portile2 (~> 2.8)
229244
pkg-config (~> 1.5)
230245
rubyzip (~> 2.3)
231-
rdoc (6.10.0)
246+
rdoc (6.11.0)
232247
psych (>= 4.0.0)
233248
regexp_parser (2.10.0)
234249
reline (0.6.0)
235250
io-console (~> 0.5)
236251
rexml (3.4.0)
237-
rubocop (1.69.2)
252+
rubocop (1.71.1)
238253
json (~> 2.3)
239254
language_server-protocol (>= 3.17.0)
240255
parallel (~> 1.10)
241256
parser (>= 3.3.0.2)
242257
rainbow (>= 2.2.2, < 4.0)
243258
regexp_parser (>= 2.9.3, < 3.0)
244-
rubocop-ast (>= 1.36.2, < 2.0)
259+
rubocop-ast (>= 1.38.0, < 2.0)
245260
ruby-progressbar (~> 1.7)
246261
unicode-display_width (>= 2.4.0, < 4.0)
247-
rubocop-ast (1.37.0)
262+
rubocop-ast (1.38.0)
248263
parser (>= 3.3.1.0)
249264
rubocop-minitest (0.36.0)
250265
rubocop (>= 1.61, < 2.0)
251266
rubocop-ast (>= 1.31.1, < 2.0)
252-
rubocop-performance (1.23.0)
267+
rubocop-performance (1.23.1)
253268
rubocop (>= 1.48.1, < 2.0)
254269
rubocop-ast (>= 1.31.1, < 2.0)
255-
rubocop-rails (2.28.0)
270+
rubocop-rails (2.29.1)
256271
activesupport (>= 4.2.0)
257272
rack (>= 1.1)
258273
rubocop (>= 1.52.0, < 2.0)
@@ -263,15 +278,15 @@ GEM
263278
rubocop-performance
264279
rubocop-rails
265280
ruby-progressbar (1.13.0)
266-
rubyzip (2.3.2)
281+
rubyzip (2.4.1)
267282
securerandom (0.4.1)
268-
selenium-webdriver (4.27.0)
283+
selenium-webdriver (4.28.0)
269284
base64 (~> 0.2)
270285
logger (~> 1.4)
271286
rexml (~> 3.2, >= 3.2.5)
272287
rubyzip (>= 1.2.2, < 3.0)
273288
websocket (~> 1.0)
274-
solid_cable (3.0.5)
289+
solid_cable (3.0.7)
275290
actioncable (>= 7.2)
276291
activejob (>= 7.2)
277292
activerecord (>= 7.2)
@@ -280,7 +295,7 @@ GEM
280295
activejob (>= 7.2)
281296
activerecord (>= 7.2)
282297
railties (>= 7.2)
283-
solid_queue (1.1.0)
298+
solid_queue (1.1.3)
284299
activejob (>= 7.1)
285300
activerecord (>= 7.1)
286301
concurrent-ruby (>= 1.3.1)
@@ -295,15 +310,15 @@ GEM
295310
ostruct
296311
stringio (3.1.2)
297312
thor (1.3.2)
298-
thruster (0.1.9)
299-
thruster (0.1.9-aarch64-linux)
300-
thruster (0.1.9-arm64-darwin)
301-
thruster (0.1.9-x86_64-darwin)
302-
thruster (0.1.9-x86_64-linux)
313+
thruster (0.1.10)
314+
thruster (0.1.10-aarch64-linux)
315+
thruster (0.1.10-arm64-darwin)
316+
thruster (0.1.10-x86_64-darwin)
317+
thruster (0.1.10-x86_64-linux)
303318
timeout (0.4.3)
304319
tzinfo (2.0.6)
305320
concurrent-ruby (~> 1.0)
306-
unicode-display_width (3.1.2)
321+
unicode-display_width (3.1.4)
307322
unicode-emoji (~> 4.0, >= 4.0.4)
308323
unicode-emoji (4.0.4)
309324
uri (1.0.2)
@@ -314,7 +329,8 @@ GEM
314329
bindex (>= 0.4.0)
315330
railties (>= 6.0.0)
316331
websocket (1.2.11)
317-
websocket-driver (0.7.6)
332+
websocket-driver (0.7.7)
333+
base64
318334
websocket-extensions (>= 0.1.0)
319335
websocket-extensions (0.1.5)
320336
with_advisory_lock (5.1.0)
@@ -355,4 +371,4 @@ DEPENDENCIES
355371
with_advisory_lock
356372

357373
BUNDLED WITH
358-
2.6.2
374+
2.6.3

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Requirements
44

5-
- Ruby 3.3.6
5+
- Ruby 3.4.1
66
- PostgreSQL
77

88
## Prepare

config/deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ env:
4444
# JOB_CONCURRENCY: 3
4545

4646
# Set number of cores available to the application on each server (default: 1).
47-
# WEB_CONCURRENCY: 2
47+
# WEB_CONCURRENCY: auto
4848

4949
# Match this to any external database server to configure Active Record correctly
5050
# Use messaging_relay-db for a db accessory server on same machine via local kamal docker network.
@@ -59,7 +59,7 @@ aliases:
5959
console: app exec --interactive --reuse "bin/rails console"
6060
shell: app exec --interactive --reuse "bash"
6161
logs: app logs -f
62-
dbc: app exec --interactive --reuse "bin/rails dbconsole"
62+
dbc: app exec --interactive --reuse "bin/rails dbconsole --include-password"
6363

6464

6565
# Bridge fingerprinted assets, like JS and CSS, between versions to avoid
@@ -76,7 +76,7 @@ builder:
7676
#
7777
# # Pass arguments and secrets to the Docker build process
7878
# args:
79-
# RUBY_VERSION: 3.3.6
79+
# RUBY_VERSION: 3.4.1
8080
# secrets:
8181
# - GITHUB_TOKEN
8282
# - RAILS_MASTER_KEY

0 commit comments

Comments
 (0)