From c2d03c214a0bdfef20f9ac4915dc223ced02749f Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Tue, 28 Jan 2025 15:43:33 +0530 Subject: [PATCH 1/2] fix(hotrod): include CA certificates for HOTRod docker images Signed-off-by: Prashant Shahi --- examples/hotrod/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/hotrod/Dockerfile b/examples/hotrod/Dockerfile index 3916c5b75b4..af4906af9bc 100644 --- a/examples/hotrod/Dockerfile +++ b/examples/hotrod/Dockerfile @@ -1,9 +1,13 @@ # Copyright (c) 2024 The Jaeger Authors. # SPDX-License-Identifier: Apache-2.0 +FROM alpine:latest AS prep +RUN apk --update add ca-certificates + FROM scratch ARG TARGETARCH EXPOSE 8080 8081 8082 8083 +COPY --from=prep /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY hotrod-linux-$TARGETARCH /go/bin/hotrod-linux ENTRYPOINT ["/go/bin/hotrod-linux"] CMD ["all"] From 290b95e63ec4d761226cacac5a4161d5729143db Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Wed, 29 Jan 2025 00:59:41 +0530 Subject: [PATCH 2/2] chore(hotrod): update Dockerfile Signed-off-by: Prashant Shahi --- examples/hotrod/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/hotrod/Dockerfile b/examples/hotrod/Dockerfile index af4906af9bc..b9be97cb45e 100644 --- a/examples/hotrod/Dockerfile +++ b/examples/hotrod/Dockerfile @@ -1,13 +1,14 @@ # Copyright (c) 2024 The Jaeger Authors. # SPDX-License-Identifier: Apache-2.0 -FROM alpine:latest AS prep -RUN apk --update add ca-certificates +FROM alpine:3.21.2 AS cert +RUN apk add --update --no-cache ca-certificates FROM scratch ARG TARGETARCH EXPOSE 8080 8081 8082 8083 -COPY --from=prep /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +COPY --from=cert /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY hotrod-linux-$TARGETARCH /go/bin/hotrod-linux ENTRYPOINT ["/go/bin/hotrod-linux"] CMD ["all"] +