From 6791330d216110c50523730e1106c9709a742b6d Mon Sep 17 00:00:00 2001 From: Patrik Date: Tue, 19 Sep 2023 14:03:21 +0200 Subject: [PATCH] chore: bump docker base images --- .docker/Dockerfile-build | 4 ++-- .docker/Dockerfile-distroless-static | 2 +- .docker/Dockerfile-hsm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.docker/Dockerfile-build b/.docker/Dockerfile-build index f0f0b30d1dc..fd469172cb2 100644 --- a/.docker/Dockerfile-build +++ b/.docker/Dockerfile-build @@ -1,4 +1,4 @@ -FROM golang:1.20-bullseye AS builder +FROM golang:1.21 AS builder WORKDIR /go/src/github.com/ory/hydra @@ -19,7 +19,7 @@ RUN go build -tags sqlite,json1 -o /usr/bin/hydra ######################### -FROM gcr.io/distroless/base-nossl-debian11:nonroot AS runner +FROM gcr.io/distroless/base-nossl-debian12:nonroot AS runner COPY --from=builder --chown=nonroot:nonroot /var/lib/sqlite /var/lib/sqlite COPY --from=builder /usr/bin/hydra /usr/bin/hydra diff --git a/.docker/Dockerfile-distroless-static b/.docker/Dockerfile-distroless-static index 352fc467791..054c9c79758 100644 --- a/.docker/Dockerfile-distroless-static +++ b/.docker/Dockerfile-distroless-static @@ -1,4 +1,4 @@ -FROM gcr.io/distroless/static-debian11:nonroot +FROM gcr.io/distroless/static-debian12:nonroot COPY hydra /usr/bin/hydra # Declare the standard ports used by hydra (4444 for public service endpoint, 4445 for admin service endpoint) diff --git a/.docker/Dockerfile-hsm b/.docker/Dockerfile-hsm index 25ba963ba9e..be99c70d83c 100644 --- a/.docker/Dockerfile-hsm +++ b/.docker/Dockerfile-hsm @@ -1,4 +1,4 @@ -FROM golang:1.20 AS builder +FROM golang:1.21 AS builder WORKDIR /go/src/github.com/ory/hydra @@ -34,7 +34,7 @@ RUN apt-get -y install softhsm opensc &&\ ############################### -FROM gcr.io/distroless/base-nossl-debian11:debug-nonroot AS runner +FROM gcr.io/distroless/base-nossl-debian12:debug-nonroot AS runner ENV HSM_ENABLED=true ENV HSM_LIBRARY=/usr/lib/softhsm/libsofthsm2.so