Merge 6791330 into 9e9be2d

ory · Sep 19, 2023 · 5073440 · 5073440
2 parents 9e9be2d + 6791330
commit 5073440
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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