From 10b50965300f5607dcb11d58ddcede9fdb0257e3 Mon Sep 17 00:00:00 2001 From: Sylvain Rabot Date: Mon, 13 Oct 2025 17:48:44 +0200 Subject: [PATCH 1/2] fix(docker): add timezones database in base and scratch images Signed-off-by: Sylvain Rabot --- base.Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/base.Dockerfile b/base.Dockerfile index a2888c7a2e..75435b2dbb 100644 --- a/base.Dockerfile +++ b/base.Dockerfile @@ -1,8 +1,9 @@ FROM ubuntu:22.04 AS base -RUN apt update && apt install -y ca-certificates curl && rm -rf /var/lib/apt/lists/* +RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y ca-certificates curl tzdata && rm -rf /var/lib/apt/lists/* -FROM alpine:latest as certs +FROM alpine:latest AS certs RUN apk --update add ca-certificates -FROM scratch AS scratch -COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt \ No newline at end of file +FROM scratch +COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +COPY --from=base /usr/share/zoneinfo /usr/share/zoneinfo From 8412b9dc71154d321673fab06aaa39093ea9fe7d Mon Sep 17 00:00:00 2001 From: Sylvain Rabot Date: Mon, 13 Oct 2025 18:06:33 +0200 Subject: [PATCH 2/2] fix(docker): re-add scratch target Signed-off-by: Sylvain Rabot --- base.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base.Dockerfile b/base.Dockerfile index 75435b2dbb..5dddd2fb3f 100644 --- a/base.Dockerfile +++ b/base.Dockerfile @@ -4,6 +4,6 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y ca-certificates FROM alpine:latest AS certs RUN apk --update add ca-certificates -FROM scratch +FROM scratch AS scratch COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=base /usr/share/zoneinfo /usr/share/zoneinfo