diff --git a/.ruby-version b/.ruby-version index fd2a01863..0aec50e6e 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.0 +3.1.4 diff --git a/Dockerfile b/Dockerfile index b42e5f224..cba38bda0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.1.0-alpine3.15 +FROM ruby:3.1.4-alpine3.18 ENV RAILS_ENV=production \ NODE_ENV=production \ @@ -24,11 +24,8 @@ RUN apk update && apk add -Uu --no-cache zlib-dev busybox ncurses # hadolint ignore=DL3018 RUN apk add -U --no-cache bash build-base git tzdata libxml2 libxml2-dev \ - postgresql-libs postgresql-dev nodejs yarn \ - chromium=99.0.4844.84-r0 chromium-chromedriver=99.0.4844.84-r0 - -# Remove once base image ruby:3.1.0-alpine3.15 has been updated -RUN apk add --no-cache gmp=6.2.1-r1 libretls=3.3.4-r3 + postgresql-libs postgresql-dev nodejs yarn \ + chromium chromium-chromedriver # Copy Entrypoint script COPY script/docker-entrypoint.sh . diff --git a/Gemfile.lock b/Gemfile.lock index 9ddcf4769..735e26dfe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -744,7 +744,7 @@ DEPENDENCIES yabeda-sidekiq RUBY VERSION - ruby 3.1.0p0 + ruby 3.1.4p223 BUNDLED WITH 2.3.10