Skip to content

Commit 67f06eb

Browse files
authored
Merge pull request ClickHouse#101678 from motsc/distroless-debian13
Upgrade distroless base from Debian 12 to Debian 13
2 parents 6896f28 + 5c30fd9 commit 67f06eb

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

docker/keeper/Dockerfile.distroless

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# The entrypoint is the compiled `clickhouse docker-init --keeper` subcommand.
44
#
55
# Build targets:
6-
# production — gcr.io/distroless/cc-debian12:nonroot (default)
7-
# debug — gcr.io/distroless/cc-debian12:debug-nonroot (includes busybox shell)
6+
# production — gcr.io/distroless/cc-debian13:nonroot (default)
7+
# debug — gcr.io/distroless/cc-debian13:debug-nonroot (includes busybox shell)
88
#
99
# Usage:
1010
# docker build -f Dockerfile.distroless --target production -t clickhouse/clickhouse-keeper:distroless .
@@ -138,8 +138,8 @@ RUN mkdir -p \
138138
# ──────────────────────────────────────────────────────────────────────────────
139139
# Stage 2: Production distroless image.
140140
# ──────────────────────────────────────────────────────────────────────────────
141-
# Pinned 2026-03-10. Refresh: docker pull gcr.io/distroless/cc-debian12:nonroot && docker inspect --format='{{index .RepoDigests 0}}' gcr.io/distroless/cc-debian12:nonroot
142-
FROM gcr.io/distroless/cc-debian12:nonroot@sha256:7e5b8df2f4d36f5599ef4ab856d7d444922531709becb03f3368c6d797d0a5eb AS production
141+
# Pinned 2026-04-02. Refresh: docker pull gcr.io/distroless/cc-debian13:nonroot && docker inspect --format='{{index .RepoDigests 0}}' gcr.io/distroless/cc-debian13:nonroot
142+
FROM gcr.io/distroless/cc-debian13:nonroot@sha256:9c4fe2381c2e6d53c4cfdefeff6edbd2a67ec7713e2c3ca6653806cbdbf27a1e AS production
143143

144144
COPY --from=ch-builder /output/ /
145145

@@ -161,8 +161,8 @@ ENTRYPOINT ["/usr/bin/clickhouse", "docker-init", "--keeper"]
161161
# Stage 3: Debug image — same as production but includes the busybox shell
162162
# at /busybox/sh for interactive troubleshooting.
163163
# ──────────────────────────────────────────────────────────────────────────────
164-
# Pinned 2026-03-10. Refresh: docker pull gcr.io/distroless/cc-debian12:debug-nonroot && docker inspect --format='{{index .RepoDigests 0}}' gcr.io/distroless/cc-debian12:debug-nonroot
165-
FROM gcr.io/distroless/cc-debian12:debug-nonroot@sha256:641f055b21555d5e4f77b7f1f3caca80840a76c4f7ae5df36a159a436941d2c2 AS debug
164+
# Pinned 2026-04-02. Refresh: docker pull gcr.io/distroless/cc-debian13:debug-nonroot && docker inspect --format='{{index .RepoDigests 0}}' gcr.io/distroless/cc-debian13:debug-nonroot
165+
FROM gcr.io/distroless/cc-debian13:debug-nonroot@sha256:d47b319b1047dff7cdee335e3e61468f3610fac20060653aabe3786d6ecba621 AS debug
166166

167167
COPY --from=ch-builder /output/ /
168168

docker/server/Dockerfile.distroless

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# The entrypoint is the compiled `clickhouse docker-init` subcommand.
44
#
55
# Build targets:
6-
# production — gcr.io/distroless/cc-debian12:nonroot (default)
7-
# debug — gcr.io/distroless/cc-debian12:debug-nonroot (includes busybox shell)
6+
# production — gcr.io/distroless/cc-debian13:nonroot (default)
7+
# debug — gcr.io/distroless/cc-debian13:debug-nonroot (includes busybox shell)
88
#
99
# Usage:
1010
# docker build -f Dockerfile.distroless --target production -t clickhouse/clickhouse-server:distroless .
@@ -156,8 +156,8 @@ RUN { \
156156
# ──────────────────────────────────────────────────────────────────────────────
157157
# Stage 2: Production distroless image.
158158
# ──────────────────────────────────────────────────────────────────────────────
159-
# Pinned 2026-03-10. Refresh: docker pull gcr.io/distroless/cc-debian12:nonroot && docker inspect --format='{{index .RepoDigests 0}}' gcr.io/distroless/cc-debian12:nonroot
160-
FROM gcr.io/distroless/cc-debian12:nonroot@sha256:7e5b8df2f4d36f5599ef4ab856d7d444922531709becb03f3368c6d797d0a5eb AS production
159+
# Pinned 2026-04-02. Refresh: docker pull gcr.io/distroless/cc-debian13:nonroot && docker inspect --format='{{index .RepoDigests 0}}' gcr.io/distroless/cc-debian13:nonroot
160+
FROM gcr.io/distroless/cc-debian13:nonroot@sha256:9c4fe2381c2e6d53c4cfdefeff6edbd2a67ec7713e2c3ca6653806cbdbf27a1e AS production
161161

162162
COPY --from=ch-builder /output/ /
163163

@@ -179,8 +179,8 @@ ENTRYPOINT ["/usr/bin/clickhouse", "docker-init"]
179179
# Stage 3: Debug image — same as production but includes the busybox shell
180180
# at /busybox/sh for interactive troubleshooting.
181181
# ──────────────────────────────────────────────────────────────────────────────
182-
# Pinned 2026-03-10. Refresh: docker pull gcr.io/distroless/cc-debian12:debug-nonroot && docker inspect --format='{{index .RepoDigests 0}}' gcr.io/distroless/cc-debian12:debug-nonroot
183-
FROM gcr.io/distroless/cc-debian12:debug-nonroot@sha256:641f055b21555d5e4f77b7f1f3caca80840a76c4f7ae5df36a159a436941d2c2 AS debug
182+
# Pinned 2026-04-02. Refresh: docker pull gcr.io/distroless/cc-debian13:debug-nonroot && docker inspect --format='{{index .RepoDigests 0}}' gcr.io/distroless/cc-debian13:debug-nonroot
183+
FROM gcr.io/distroless/cc-debian13:debug-nonroot@sha256:d47b319b1047dff7cdee335e3e61468f3610fac20060653aabe3786d6ecba621 AS debug
184184

185185
COPY --from=ch-builder /output/ /
186186

0 commit comments

Comments
 (0)