From c6875cc4e5e5882093f5b3db8636b348442f0ea4 Mon Sep 17 00:00:00 2001
From: Thibaut <thi-baut@users.noreply.github.com>
Date: Sun, 1 Sep 2024 16:34:53 -0400
Subject: [PATCH 1/2] Update Dockerfile

Bumped to distroless base-debian12
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 639dc5ca4f1..43a1033743e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN .teamcity/install-cloudflare-go.sh
 RUN PATH="/tmp/go/bin:$PATH" make cloudflared
 
 # use a distroless base image with glibc
-FROM gcr.io/distroless/base-debian11:nonroot
+FROM gcr.io/distroless/base-debian12:nonroot
 
 LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared"
 

From 4ed5fbd7d0ff77fdd6043e2672d4f83d263f1d5e Mon Sep 17 00:00:00 2001
From: thi-baut <thi-baut@users.noreply.github.com>
Date: Sun, 1 Sep 2024 16:51:29 -0400
Subject: [PATCH 2/2] bumped distroless/base-debian12

---
 Dockerfile.amd64 | 2 +-
 Dockerfile.arm64 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
index f17969cb0b5..a0417c065d9 100644
--- a/Dockerfile.amd64
+++ b/Dockerfile.amd64
@@ -14,7 +14,7 @@ RUN .teamcity/install-cloudflare-go.sh
 RUN GOOS=linux GOARCH=amd64 PATH="/tmp/go/bin:$PATH" make cloudflared
 
 # use a distroless base image with glibc
-FROM gcr.io/distroless/base-debian11:nonroot
+FROM gcr.io/distroless/base-debian12:nonroot
 
 LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared"
 
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 67f4935d67c..d200581e112 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -14,7 +14,7 @@ RUN .teamcity/install-cloudflare-go.sh
 RUN GOOS=linux GOARCH=arm64 PATH="/tmp/go/bin:$PATH" make cloudflared
 
 # use a distroless base image with glibc
-FROM gcr.io/distroless/base-debian11:nonroot-arm64
+FROM gcr.io/distroless/base-debian12:nonroot-arm64
 
 LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared"