Skip to content

Commit

Permalink
bundle update
Browse files Browse the repository at this point in the history
  • Loading branch information
jasl committed Jan 14, 2025
1 parent 1518140 commit b8ad931
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
ARG RUBY_VERSION=3.3.6
ARG RUBY_VERSION=3.4.1
FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html

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

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


# Throw-away build stage to reduce size of final image
FROM base AS build

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




# Final stage for app image
FROM base

Expand Down
54 changes: 33 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/rails/rails.git
revision: 6911b00c7c827c853afc535f0bda2b26b1a5fa33
revision: 20a0e51589536f26969ed799bdb866f31e7c746e
branch: main
specs:
actioncable (8.1.0.alpha)
Expand Down Expand Up @@ -110,7 +110,7 @@ GEM
bindex (0.8.1)
bootsnap (1.18.4)
msgpack (~> 1.2)
brakeman (6.2.2)
brakeman (7.0.0)
racc
builder (3.3.0)
capybara (3.40.0)
Expand All @@ -123,7 +123,7 @@ GEM
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
connection_pool (2.5.0)
crass (1.0.6)
date (3.4.1)
debug (1.10.0)
Expand Down Expand Up @@ -158,10 +158,10 @@ GEM
sshkit (>= 1.23.0, < 2.0)
thor (~> 1.3)
zeitwerk (>= 2.6.18, < 3.0)
keccak (1.3.1)
keccak (1.3.2)
language_server-protocol (3.17.0.3)
logger (1.6.4)
loofah (2.23.1)
logger (1.6.5)
loofah (2.24.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand All @@ -175,7 +175,7 @@ GEM
mini_portile2 (2.8.8)
minitest (5.25.4)
msgpack (1.7.5)
net-imap (0.5.4)
net-imap (0.5.5)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -189,17 +189,27 @@ GEM
net-smtp (0.5.0)
net-ssh (7.3.0)
nio4r (2.7.4)
nokogiri (1.17.2)
nokogiri (1.18.1)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.18.1-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.1-arm-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.1-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.1-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.1-x86_64-linux-gnu)
racc (~> 1.4)
ostruct (0.6.1)
pagy (9.3.3)
parallel (1.26.3)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
pg (1.5.9)
pkg-config (1.5.8)
pkg-config (1.5.9)
psych (5.2.2)
date
stringio
Expand All @@ -209,7 +219,8 @@ GEM
raabro (1.4.0)
racc (1.8.1)
rack (3.1.8)
rack-session (2.0.0)
rack-session (2.1.0)
base64 (>= 0.1.0)
rack (>= 3.0.0)
rack-test (2.2.0)
rack (>= 1.3)
Expand All @@ -234,7 +245,7 @@ GEM
reline (0.6.0)
io-console (~> 0.5)
rexml (3.4.0)
rubocop (1.69.2)
rubocop (1.70.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -249,7 +260,7 @@ GEM
rubocop-minitest (0.36.0)
rubocop (>= 1.61, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-performance (1.23.0)
rubocop-performance (1.23.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.28.0)
Expand All @@ -263,7 +274,7 @@ GEM
rubocop-performance
rubocop-rails
ruby-progressbar (1.13.0)
rubyzip (2.3.2)
rubyzip (2.4.1)
securerandom (0.4.1)
selenium-webdriver (4.27.0)
base64 (~> 0.2)
Expand All @@ -280,7 +291,7 @@ GEM
activejob (>= 7.2)
activerecord (>= 7.2)
railties (>= 7.2)
solid_queue (1.1.0)
solid_queue (1.1.2)
activejob (>= 7.1)
activerecord (>= 7.1)
concurrent-ruby (>= 1.3.1)
Expand All @@ -295,15 +306,15 @@ GEM
ostruct
stringio (3.1.2)
thor (1.3.2)
thruster (0.1.9)
thruster (0.1.9-aarch64-linux)
thruster (0.1.9-arm64-darwin)
thruster (0.1.9-x86_64-darwin)
thruster (0.1.9-x86_64-linux)
thruster (0.1.10)
thruster (0.1.10-aarch64-linux)
thruster (0.1.10-arm64-darwin)
thruster (0.1.10-x86_64-darwin)
thruster (0.1.10-x86_64-linux)
timeout (0.4.3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (3.1.2)
unicode-display_width (3.1.4)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
uri (1.0.2)
Expand All @@ -314,7 +325,8 @@ GEM
bindex (>= 0.4.0)
railties (>= 6.0.0)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-driver (0.7.7)
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
with_advisory_lock (5.1.0)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Requirements

- Ruby 3.3.6
- Ruby 3.4.1
- PostgreSQL

## Prepare
Expand Down
6 changes: 3 additions & 3 deletions config/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ env:
# JOB_CONCURRENCY: 3

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

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


# Bridge fingerprinted assets, like JS and CSS, between versions to avoid
Expand All @@ -76,7 +76,7 @@ builder:
#
# # Pass arguments and secrets to the Docker build process
# args:
# RUBY_VERSION: 3.3.6
# RUBY_VERSION: 3.4.1
# secrets:
# - GITHUB_TOKEN
# - RAILS_MASTER_KEY
Expand Down

0 comments on commit b8ad931

Please sign in to comment.