From abab72cc7333e86db1fa667d8b6f78d55e3aa62d Mon Sep 17 00:00:00 2001 From: "Peter A. Jonsson" Date: Wed, 3 Sep 2025 14:24:57 +0200 Subject: [PATCH] debian: align postgres repo url with docs The PostgreSQL documentation for packages (https://www.postgresql.org/download/linux/ubuntu/) does not have a trailing slash. --- 13/bookworm/Dockerfile | 2 +- 13/trixie/Dockerfile | 2 +- 14/bookworm/Dockerfile | 2 +- 14/trixie/Dockerfile | 2 +- 15/bookworm/Dockerfile | 2 +- 15/trixie/Dockerfile | 2 +- 16/bookworm/Dockerfile | 2 +- 16/trixie/Dockerfile | 2 +- 17/bookworm/Dockerfile | 2 +- 17/trixie/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/trixie/Dockerfile | 2 +- Dockerfile-debian.template | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/13/bookworm/Dockerfile b/13/bookworm/Dockerfile index 6d4f27fbb5..2cdd3761f7 100644 --- a/13/bookworm/Dockerfile +++ b/13/bookworm/Dockerfile @@ -97,7 +97,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ amd64 | arm64 | ppc64el) \ # arches officialy built by upstream diff --git a/13/trixie/Dockerfile b/13/trixie/Dockerfile index dff96a88af..5c70e0f019 100644 --- a/13/trixie/Dockerfile +++ b/13/trixie/Dockerfile @@ -97,7 +97,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt trixie-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ amd64 | arm64 | ppc64el) \ # arches officialy built by upstream diff --git a/14/bookworm/Dockerfile b/14/bookworm/Dockerfile index 229905fecc..ed279f475c 100644 --- a/14/bookworm/Dockerfile +++ b/14/bookworm/Dockerfile @@ -97,7 +97,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ amd64 | arm64 | ppc64el) \ # arches officialy built by upstream diff --git a/14/trixie/Dockerfile b/14/trixie/Dockerfile index 3708b63e2a..9eaeb256c5 100644 --- a/14/trixie/Dockerfile +++ b/14/trixie/Dockerfile @@ -97,7 +97,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt trixie-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ amd64 | arm64 | ppc64el) \ # arches officialy built by upstream diff --git a/15/bookworm/Dockerfile b/15/bookworm/Dockerfile index 34004b4332..cbb364513b 100644 --- a/15/bookworm/Dockerfile +++ b/15/bookworm/Dockerfile @@ -97,7 +97,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ amd64 | arm64 | ppc64el) \ # arches officialy built by upstream diff --git a/15/trixie/Dockerfile b/15/trixie/Dockerfile index bb1263f8cb..4ca315110e 100644 --- a/15/trixie/Dockerfile +++ b/15/trixie/Dockerfile @@ -97,7 +97,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt trixie-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ amd64 | arm64 | ppc64el) \ # arches officialy built by upstream diff --git a/16/bookworm/Dockerfile b/16/bookworm/Dockerfile index 49f704308b..dd38da963d 100644 --- a/16/bookworm/Dockerfile +++ b/16/bookworm/Dockerfile @@ -97,7 +97,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ amd64 | arm64 | ppc64el) \ # arches officialy built by upstream diff --git a/16/trixie/Dockerfile b/16/trixie/Dockerfile index db0988a3cb..5e522725aa 100644 --- a/16/trixie/Dockerfile +++ b/16/trixie/Dockerfile @@ -97,7 +97,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt trixie-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ amd64 | arm64 | ppc64el) \ # arches officialy built by upstream diff --git a/17/bookworm/Dockerfile b/17/bookworm/Dockerfile index aec2a51f6c..5c2f6e07f9 100644 --- a/17/bookworm/Dockerfile +++ b/17/bookworm/Dockerfile @@ -97,7 +97,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ amd64 | arm64 | ppc64el) \ # arches officialy built by upstream diff --git a/17/trixie/Dockerfile b/17/trixie/Dockerfile index 5df4f8c718..286f5f0faf 100644 --- a/17/trixie/Dockerfile +++ b/17/trixie/Dockerfile @@ -97,7 +97,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt trixie-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ amd64 | arm64 | ppc64el) \ # arches officialy built by upstream diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 56332c51ec..93fedee69d 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -97,7 +97,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ amd64 | arm64 | ppc64el) \ # arches officialy built by upstream diff --git a/18/trixie/Dockerfile b/18/trixie/Dockerfile index 76307015d7..0be79da291 100644 --- a/18/trixie/Dockerfile +++ b/18/trixie/Dockerfile @@ -97,7 +97,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt trixie-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ amd64 | arm64 | ppc64el) \ # arches officialy built by upstream diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 81a6a0a0c5..83a664b443 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -91,7 +91,7 @@ RUN set -ex; \ export PYTHONDONTWRITEBYTECODE=1; \ \ dpkgArch="$(dpkg --print-architecture)"; \ - aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ {{ env.variant }}-pgdg main $PG_MAJOR"; \ + aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt {{ env.variant }}-pgdg main $PG_MAJOR"; \ case "$dpkgArch" in \ {{ .[env.variant].arches | join(" | ") }}) \ # arches officialy built by upstream