Skip to content

fix: move base images to distroless cc-debian13 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ravisingal wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: move base images to distroless cc-debian13 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/update-docker-args.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
shell: bash
id: args
run: |
BASE_IMAGE="gcr.io/distroless/cc-debian12"
BASE_IMAGE="gcr.io/distroless/cc-debian13"
BASE_IMAGE_TAG="debug"
BASE_IMAGE_DIGEST=$(gcloud container images list-tags $BASE_IMAGE --format json | jq --arg tag "$BASE_IMAGE_TAG" -r '.[] | {digest: .digest, tag: .tags[]} | select(.tag == $tag) | .digest')
if [ -n "$BASE_IMAGE_DIGEST" ]; then
Expand Down
14 changes: 7 additions & 7 deletions java-11/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BASE_IMAGE
# Zulu CA build straight from Azul's CDN. The SHA-256 pins the download. jlink copies blocked.certs
# from the JDK it runs, so it must be the fixed one.
# TEMP: go back to azul/zulu-openjdk-debian once it publishes a tag with the fix.
FROM debian:bookworm-slim AS jre
FROM debian:trixie-slim AS jre
ARG JAVA_VERSION
ARG TARGETARCH
# Update these together with java.version.
Expand Down Expand Up @@ -73,9 +73,9 @@ jdk.zipfs\
RUN grep -q 7BA62FEC54E9D040556FCA70A6A88F03761C178FA1F7CB8390A73076849F55A2 /jre/lib/security/blocked.certs

# Extract java SSL certs
FROM gcr.io/distroless/java-base-debian12:debug AS ssl
FROM gcr.io/distroless/java-base-debian13:debug AS ssl

FROM debian:bookworm-slim As builder
FROM debian:trixie-slim AS builder
RUN apt update && apt install -y libjemalloc-dev

# stage for amd64
Expand All @@ -84,8 +84,8 @@ FROM ${BASE_IMAGE} AS base-amd64
SHELL ["/busybox/sh", "-c"]
RUN ln -s /busybox/sh /bin/sh

COPY --from=jre /lib/x86_64-linux-gnu/libz.so.1.2.13 /lib/x86_64-linux-gnu/libz.so.1.2.13
RUN ln -s /lib/x86_64-linux-gnu/libz.so.1.2.13 /lib/x86_64-linux-gnu/libz.so.1
# libz.so.1 is already present in the base image
RUN test -e /lib/x86_64-linux-gnu/libz.so.1

# change default memory allocator to jemalloc
COPY --from=builder /usr/lib/x86_64-linux-gnu/libjemalloc* /usr/lib/x86_64-linux-gnu/
Expand All @@ -97,8 +97,8 @@ FROM ${BASE_IMAGE} AS base-arm64
SHELL ["/busybox/sh", "-c"]
RUN ln -s /busybox/sh /bin/sh

COPY --from=jre /lib/aarch64-linux-gnu/libz.so.1.2.13 /lib/aarch64-linux-gnu/libz.so.1.2.13
RUN ln -s /lib/aarch64-linux-gnu/libz.so.1.2.13 /lib/aarch64-linux-gnu/libz.so.1
# libz.so.1 is already present in the base image
RUN test -e /lib/aarch64-linux-gnu/libz.so.1

# change default memory allocator to jemalloc
COPY --from=builder /usr/lib/aarch64-linux-gnu/libjemalloc* /usr/lib/aarch64-linux-gnu/
Expand Down
2 changes: 1 addition & 1 deletion java-11/base.image
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
gcr.io/distroless/cc-debian12:debug@sha256:bc3546a529388660b583cc85ca6559927652d54391dc8059419d7b4bf3921154
gcr.io/distroless/cc-debian13:debug@sha256:8eb229dfe1ec97410a495e312dfba214afd86bfc72010973e08796ac5e94e234
14 changes: 7 additions & 7 deletions java-21/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BASE_IMAGE
# Zulu CA build straight from Azul's CDN. The SHA-256 pins the download. jlink copies blocked.certs
# from the JDK it runs, so it must be the fixed one.
# TEMP: go back to azul/zulu-openjdk-debian once it publishes a tag with the fix.
FROM debian:bookworm-slim AS jre
FROM debian:trixie-slim AS jre
ARG JAVA_VERSION
ARG TARGETARCH
# Update these together with java.version.
Expand Down Expand Up @@ -73,9 +73,9 @@ jdk.zipfs\
RUN grep -q 7BA62FEC54E9D040556FCA70A6A88F03761C178FA1F7CB8390A73076849F55A2 /jre/lib/security/blocked.certs

# Extract java SSL certs
FROM gcr.io/distroless/java-base-debian12:debug AS ssl
FROM gcr.io/distroless/java-base-debian13:debug AS ssl

FROM debian:bookworm-slim AS builder
FROM debian:trixie-slim AS builder
RUN apt update && apt install -y libjemalloc-dev

# stage for amd64
Expand All @@ -84,8 +84,8 @@ FROM ${BASE_IMAGE} AS base-amd64
SHELL ["/busybox/sh", "-c"]
RUN ln -s /busybox/sh /bin/sh

COPY --from=jre /lib/x86_64-linux-gnu/libz.so.1.2.13 /lib/x86_64-linux-gnu/libz.so.1.2.13
RUN ln -s /lib/x86_64-linux-gnu/libz.so.1.2.13 /lib/x86_64-linux-gnu/libz.so.1
# libz.so.1 is already present in the base image
RUN test -e /lib/x86_64-linux-gnu/libz.so.1

# change default memory allocator to jemalloc
COPY --from=builder /usr/lib/x86_64-linux-gnu/libjemalloc* /usr/lib/x86_64-linux-gnu/
Expand All @@ -97,8 +97,8 @@ FROM ${BASE_IMAGE} AS base-arm64
SHELL ["/busybox/sh", "-c"]
RUN ln -s /busybox/sh /bin/sh

COPY --from=jre /lib/aarch64-linux-gnu/libz.so.1.2.13 /lib/aarch64-linux-gnu/libz.so.1.2.13
RUN ln -s /lib/aarch64-linux-gnu/libz.so.1.2.13 /lib/aarch64-linux-gnu/libz.so.1
# libz.so.1 is already present in the base image
RUN test -e /lib/aarch64-linux-gnu/libz.so.1

# change default memory allocator to jemalloc
COPY --from=builder /usr/lib/aarch64-linux-gnu/libjemalloc* /usr/lib/aarch64-linux-gnu/
Expand Down
2 changes: 1 addition & 1 deletion java-21/base.image
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
gcr.io/distroless/cc-debian12:debug@sha256:bc3546a529388660b583cc85ca6559927652d54391dc8059419d7b4bf3921154
gcr.io/distroless/cc-debian13:debug@sha256:8eb229dfe1ec97410a495e312dfba214afd86bfc72010973e08796ac5e94e234
Loading