Merge branch 'main' into symfony

sudo-bot · Jun 10, 2024 · 1900378 · 1900378
2 parents 8e70560 + 0556533
commit 1900378
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3-alpine3.19 as builder
+FROM ruby:3-alpine3.20 as builder
 
 COPY Gemfile ./
 
@@ -8,7 +8,7 @@ RUN apk add --update --no-cache make ruby-dev gcc musl-dev && \
     apk del gcc make musl-dev ruby-dev && \
     rm -rf /usr/local/bundle/cache /root/.bundle
 
-FROM ruby:3-alpine3.19
+FROM ruby:3-alpine3.20
 
 # Metadata params
 ARG VCS_REF

diff --git a/docker/Gemfile b/docker/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'capistrano', '3.17.1'
+gem 'capistrano', '3.18.1'
 gem 'capistrano-symfony', '~> 2.0.0'
 # For SSH to work on some machines
-gem 'ed25519', '~> 1.2'
-gem 'bcrypt_pbkdf', '~> 1.0'
+gem 'ed25519', '~> 1.3'
+gem 'bcrypt_pbkdf', '~> 1.1'