Skip to content

Commit

Permalink
Switch back to debian 11 for haproxy and local-path-helper images
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Grunert <[email protected]>
  • Loading branch information
saschagrunert committed Sep 5, 2023
1 parent a7c62c4 commit 57d5806
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions images/haproxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# This image is a haproxy image + minimal config so the container will not exit
# while we rewrite the config at runtime and signal haproxy to reload.

ARG BASE="registry.k8s.io/build-image/debian-base:bookworm-v1.0.0"
ARG BASE="registry.k8s.io/build-image/debian-base:bullseye-v1.4.3"
FROM ${BASE} as build

# NOTE: copyrights.tar.gz is a quirk of Kubernetes's debian-base image
Expand Down Expand Up @@ -50,7 +50,7 @@ RUN mkdir -p "${STAGE_DIR}" && \

# See: https://github.com/GoogleContainerTools/distroless/tree/main/base
# This has /etc/passwd, tzdata, cacerts
FROM "gcr.io/distroless/static-debian12"
FROM "gcr.io/distroless/static-debian11"

ARG STAGE_DIR="/opt/stage"

Expand Down
4 changes: 2 additions & 2 deletions images/local-path-helper/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# This image is contains the binaries needed for the local-path-provisioner
# helper pod. Currently that means: sh, rm, mkdir

ARG BASE="registry.k8s.io/build-image/debian-base:bookworm-v1.0.0"
ARG BASE="registry.k8s.io/build-image/debian-base:bullseye-v1.4.3"
FROM ${BASE} as build

# NOTE: copyrights.tar.gz is a quirk of Kubernetes's debian-base image
Expand All @@ -42,6 +42,6 @@ RUN mkdir -p "${STAGE_DIR}" && \
find "${STAGE_DIR}"

# copy staged binary + deps + copyright into distroless
FROM "gcr.io/distroless/static-debian12"
FROM "gcr.io/distroless/static-debian11"
ARG STAGE_DIR="/opt/stage"
COPY --from=build "${STAGE_DIR}/" /

0 comments on commit 57d5806

Please sign in to comment.