From 19120c9b2543a931710f99d11f416b5914534e94 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Tue, 27 Oct 2026 13:09:29 -0600 Subject: [PATCH] Include tzdata from updates on Debian images tzdata is always included in the base debian images using the version in the latest Debian point release. Those are made every few months for Debian stable, which means there could be intermediate tzdata releases that aren't included in the postgres image for quite a while. Since updated timezone data is critical to postgres, always install it manually since this will use the version from the associated -updates repo. For example, building 18/trixie: + apt-get install -y --no-install-recommends gnupg less tzdata ... The following packages will be upgraded: tzdata ... Get:2 http://deb.debian.org/debian trixie-updates/main amd64 tzdata all 2026e-0+deb13u1 [266 kB] Fixes #1421 --- 14/bookworm/Dockerfile | 1 + 14/trixie/Dockerfile | 1 + 15/bookworm/Dockerfile | 1 + 15/trixie/Dockerfile | 1 + 16/bookworm/Dockerfile | 1 + 16/trixie/Dockerfile | 1 + 17/bookworm/Dockerfile | 1 + 17/trixie/Dockerfile | 1 + 18/bookworm/Dockerfile | 1 + 18/trixie/Dockerfile | 1 + 19/bookworm/Dockerfile | 1 + 19/trixie/Dockerfile | 1 + Dockerfile-debian.template | 1 + 13 files changed, 13 insertions(+) diff --git a/14/bookworm/Dockerfile b/14/bookworm/Dockerfile index 5847ff8334..1c123c487a 100644 --- a/14/bookworm/Dockerfile +++ b/14/bookworm/Dockerfile @@ -23,6 +23,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/14/trixie/Dockerfile b/14/trixie/Dockerfile index 525bca152d..003418859c 100644 --- a/14/trixie/Dockerfile +++ b/14/trixie/Dockerfile @@ -23,6 +23,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/15/bookworm/Dockerfile b/15/bookworm/Dockerfile index c280fc9662..96c744c893 100644 --- a/15/bookworm/Dockerfile +++ b/15/bookworm/Dockerfile @@ -23,6 +23,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/15/trixie/Dockerfile b/15/trixie/Dockerfile index 3e0b26d36f..5a0a770f7a 100644 --- a/15/trixie/Dockerfile +++ b/15/trixie/Dockerfile @@ -23,6 +23,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/16/bookworm/Dockerfile b/16/bookworm/Dockerfile index e24075b6c6..8b8c13c5ca 100644 --- a/16/bookworm/Dockerfile +++ b/16/bookworm/Dockerfile @@ -23,6 +23,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/16/trixie/Dockerfile b/16/trixie/Dockerfile index 597bb69a23..863249c275 100644 --- a/16/trixie/Dockerfile +++ b/16/trixie/Dockerfile @@ -23,6 +23,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/17/bookworm/Dockerfile b/17/bookworm/Dockerfile index c5477ec537..dc0968ce38 100644 --- a/17/bookworm/Dockerfile +++ b/17/bookworm/Dockerfile @@ -23,6 +23,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/17/trixie/Dockerfile b/17/trixie/Dockerfile index 73e7dc9535..337ca983f1 100644 --- a/17/trixie/Dockerfile +++ b/17/trixie/Dockerfile @@ -23,6 +23,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 6d1d381170..c2bd12c738 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -23,6 +23,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/18/trixie/Dockerfile b/18/trixie/Dockerfile index a560621774..b8fecd21bb 100644 --- a/18/trixie/Dockerfile +++ b/18/trixie/Dockerfile @@ -23,6 +23,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/19/bookworm/Dockerfile b/19/bookworm/Dockerfile index 5efdb8a18a..c08e3b0cd2 100644 --- a/19/bookworm/Dockerfile +++ b/19/bookworm/Dockerfile @@ -23,6 +23,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/19/trixie/Dockerfile b/19/trixie/Dockerfile index 34c0311f1f..8c023fc664 100644 --- a/19/trixie/Dockerfile +++ b/19/trixie/Dockerfile @@ -23,6 +23,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index dc3924575e..1352222d15 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -17,6 +17,7 @@ RUN set -ex; \ # https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 # (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) less \ + tzdata \ ; \ rm -rf /var/lib/apt/lists/*