From 30ba71e9aa8ed97a414da7aec59a6f423a2a2d58 Mon Sep 17 00:00:00 2001
From: Jonas Hungershausen <jonas.hungershausen@ory.sh>
Date: Tue, 19 Sep 2023 17:01:23 +0200
Subject: [PATCH] chore: update docker base images (#3521)

---
 .docker/Dockerfile-build             | 10 +++++-----
 .docker/Dockerfile-debug             |  2 +-
 .docker/Dockerfile-distroless-static |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.docker/Dockerfile-build b/.docker/Dockerfile-build
index c75aed17db64..e50fc2104570 100644
--- a/.docker/Dockerfile-build
+++ b/.docker/Dockerfile-build
@@ -1,9 +1,9 @@
 # syntax = docker/dockerfile:1-experimental
 # Workaround for https://github.com/GoogleContainerTools/distroless/issues/1342
-FROM golang:1.19-bullseye AS builder
+FROM golang:1.21 AS builder
 
 RUN apt-get update && apt-get upgrade -y &&\
-    mkdir -p /var/lib/sqlite
+  mkdir -p /var/lib/sqlite
 
 WORKDIR /go/src/github.com/ory/kratos
 
@@ -25,11 +25,11 @@ ARG COMMIT
 ARG BUILD_DATE
 
 RUN --mount=type=cache,target=/root/.cache/go-build go build -tags sqlite \
-    -ldflags="-X 'github.com/ory/kratos/driver/config.Version=${VERSION}' -X 'github.com/ory/kratos/driver/config.Date=${BUILD_DATE}' -X 'github.com/ory/kratos/driver/config.Commit=${COMMIT}'" \
-    -o /usr/bin/kratos
+  -ldflags="-X 'github.com/ory/kratos/driver/config.Version=${VERSION}' -X 'github.com/ory/kratos/driver/config.Date=${BUILD_DATE}' -X 'github.com/ory/kratos/driver/config.Commit=${COMMIT}'" \
+  -o /usr/bin/kratos
 
 #########################
-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 --chown=nonroot:nonroot /usr/bin/kratos /usr/bin/kratos
diff --git a/.docker/Dockerfile-debug b/.docker/Dockerfile-debug
index a5365a546da3..9ed036daebe7 100644
--- a/.docker/Dockerfile-debug
+++ b/.docker/Dockerfile-debug
@@ -1,4 +1,4 @@
-FROM golang:1.19-buster
+FROM golang:1.21
 ENV CGO_ENABLED 1
 
 RUN apt-get update && apt-get install -y --no-install-recommends inotify-tools psmisc
diff --git a/.docker/Dockerfile-distroless-static b/.docker/Dockerfile-distroless-static
index 48cd03a868cc..569723315b89 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 kratos /usr/bin/kratos
 EXPOSE 4433 4434