Skip to content

Commit 3fb138f

Browse files
authored
Merge pull request #1669 from alphagov/bump_base_image_to_3.4.6-alpine3.22
Bump base image
2 parents 5b9e4c0 + 5b59391 commit 3fb138f

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.17.0
1+
22.16.0

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.4.1
1+
3.4.6

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ARG ALPINE_VERSION=3.21
2-
ARG RUBY_VERSION=3.4.1
1+
ARG ALPINE_VERSION=3.22
2+
ARG RUBY_VERSION=3.4.6
33

4-
ARG DOCKER_IMAGE_DIGEST=sha256:e5c30595c6a322bc3fbaacd5e35d698a6b9e6d1079ab0af09ffe52f5816aec3b
4+
ARG DOCKER_IMAGE_DIGEST=sha256:d594d5debffa14c591c4fe03b9d0d79cdc28f30d594f47be748e642746057fec
55

66
FROM ruby:${RUBY_VERSION}-alpine${ALPINE_VERSION}@${DOCKER_IMAGE_DIGEST} AS base
77
ARG NODEJS_VERSION=22
@@ -13,7 +13,7 @@ WORKDIR /app
1313

1414
RUN apk update
1515
RUN apk upgrade --available
16-
RUN apk add libc6-compat openssl-dev build-base libpq-dev nodejs=~${NODEJS_VERSION} npm git
16+
RUN apk add libc6-compat openssl-dev build-base libpq-dev nodejs=~${NODEJS_VERSION} npm git yaml-dev
1717
RUN adduser -D ruby
1818
RUN mkdir /node_modules && chown ruby:ruby -R /node_modules /app
1919

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ CHECKSUMS
759759
zeitwerk (2.7.3) sha256=b2e86b4a9b57d26ba68a15230dcc7fe6f040f06831ce64417b0621ad96ba3e85
760760

761761
RUBY VERSION
762-
ruby 3.4.1p0
762+
ruby 3.4.6p54
763763

764764
BUNDLED WITH
765765
2.7.1

0 commit comments

Comments
 (0)