From d9c4773ca5dc96692188c458f281d217d78b14d9 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Wed, 21 May 2025 17:48:07 -0700 Subject: [PATCH] Update apt build depend --- 13/bookworm/Dockerfile | 7 +++---- 13/bullseye/Dockerfile | 7 +++---- 14/bookworm/Dockerfile | 7 +++---- 14/bullseye/Dockerfile | 7 +++---- 15/bookworm/Dockerfile | 7 +++---- 15/bullseye/Dockerfile | 7 +++---- 16/bookworm/Dockerfile | 7 +++---- 16/bullseye/Dockerfile | 7 +++---- 17/bookworm/Dockerfile | 7 +++---- 17/bullseye/Dockerfile | 7 +++---- Dockerfile-debian.template | 7 +++---- 11 files changed, 33 insertions(+), 44 deletions(-) diff --git a/13/bookworm/Dockerfile b/13/bookworm/Dockerfile index 3dd050a432..721ad94d09 100644 --- a/13/bookworm/Dockerfile +++ b/13/bookworm/Dockerfile @@ -131,10 +131,9 @@ RUN set -ex; \ # build .deb files from upstream's source packages (which are verified by apt-get) nproc="$(nproc)"; \ export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \ -# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876 -# (and it "Depends: pgdg-keyring") - apt-get build-dep -y postgresql-common pgdg-keyring; \ - apt-get source --compile postgresql-common pgdg-keyring; \ +# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9 + apt-get build-dep -y postgresql-common-dev; \ + apt-get source --compile postgresql-common-dev; \ _update_repo; \ # we need DEBIAN_FRONTEND on postgresql-13 for slapd ("Please enter the password for the admin entry in your LDAP directory."); see https://bugs.debian.org/929417 DEBIAN_FRONTEND=noninteractive \ diff --git a/13/bullseye/Dockerfile b/13/bullseye/Dockerfile index 990363d494..b914b71ff0 100644 --- a/13/bullseye/Dockerfile +++ b/13/bullseye/Dockerfile @@ -131,10 +131,9 @@ RUN set -ex; \ # build .deb files from upstream's source packages (which are verified by apt-get) nproc="$(nproc)"; \ export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \ -# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876 -# (and it "Depends: pgdg-keyring") - apt-get build-dep -y postgresql-common pgdg-keyring; \ - apt-get source --compile postgresql-common pgdg-keyring; \ +# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9 + apt-get build-dep -y postgresql-common-dev; \ + apt-get source --compile postgresql-common-dev; \ _update_repo; \ # we need DEBIAN_FRONTEND on postgresql-13 for slapd ("Please enter the password for the admin entry in your LDAP directory."); see https://bugs.debian.org/929417 DEBIAN_FRONTEND=noninteractive \ diff --git a/14/bookworm/Dockerfile b/14/bookworm/Dockerfile index 701a02cccd..e9a0e21b1c 100644 --- a/14/bookworm/Dockerfile +++ b/14/bookworm/Dockerfile @@ -131,10 +131,9 @@ RUN set -ex; \ # build .deb files from upstream's source packages (which are verified by apt-get) nproc="$(nproc)"; \ export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \ -# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876 -# (and it "Depends: pgdg-keyring") - apt-get build-dep -y postgresql-common pgdg-keyring; \ - apt-get source --compile postgresql-common pgdg-keyring; \ +# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9 + apt-get build-dep -y postgresql-common-dev; \ + apt-get source --compile postgresql-common-dev; \ _update_repo; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index 004e6777cd..ff863ef774 100644 --- a/14/bullseye/Dockerfile +++ b/14/bullseye/Dockerfile @@ -131,10 +131,9 @@ RUN set -ex; \ # build .deb files from upstream's source packages (which are verified by apt-get) nproc="$(nproc)"; \ export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \ -# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876 -# (and it "Depends: pgdg-keyring") - apt-get build-dep -y postgresql-common pgdg-keyring; \ - apt-get source --compile postgresql-common pgdg-keyring; \ +# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9 + apt-get build-dep -y postgresql-common-dev; \ + apt-get source --compile postgresql-common-dev; \ _update_repo; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ diff --git a/15/bookworm/Dockerfile b/15/bookworm/Dockerfile index 953f19a827..d58f9ab6a4 100644 --- a/15/bookworm/Dockerfile +++ b/15/bookworm/Dockerfile @@ -131,10 +131,9 @@ RUN set -ex; \ # build .deb files from upstream's source packages (which are verified by apt-get) nproc="$(nproc)"; \ export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \ -# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876 -# (and it "Depends: pgdg-keyring") - apt-get build-dep -y postgresql-common pgdg-keyring; \ - apt-get source --compile postgresql-common pgdg-keyring; \ +# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9 + apt-get build-dep -y postgresql-common-dev; \ + apt-get source --compile postgresql-common-dev; \ _update_repo; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ diff --git a/15/bullseye/Dockerfile b/15/bullseye/Dockerfile index af49faecc7..ec325d7c88 100644 --- a/15/bullseye/Dockerfile +++ b/15/bullseye/Dockerfile @@ -131,10 +131,9 @@ RUN set -ex; \ # build .deb files from upstream's source packages (which are verified by apt-get) nproc="$(nproc)"; \ export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \ -# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876 -# (and it "Depends: pgdg-keyring") - apt-get build-dep -y postgresql-common pgdg-keyring; \ - apt-get source --compile postgresql-common pgdg-keyring; \ +# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9 + apt-get build-dep -y postgresql-common-dev; \ + apt-get source --compile postgresql-common-dev; \ _update_repo; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ diff --git a/16/bookworm/Dockerfile b/16/bookworm/Dockerfile index 57ce9f7b06..7421ccaf0a 100644 --- a/16/bookworm/Dockerfile +++ b/16/bookworm/Dockerfile @@ -131,10 +131,9 @@ RUN set -ex; \ # build .deb files from upstream's source packages (which are verified by apt-get) nproc="$(nproc)"; \ export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \ -# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876 -# (and it "Depends: pgdg-keyring") - apt-get build-dep -y postgresql-common pgdg-keyring; \ - apt-get source --compile postgresql-common pgdg-keyring; \ +# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9 + apt-get build-dep -y postgresql-common-dev; \ + apt-get source --compile postgresql-common-dev; \ _update_repo; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 54f864c29e..a3ac0c55ab 100644 --- a/16/bullseye/Dockerfile +++ b/16/bullseye/Dockerfile @@ -131,10 +131,9 @@ RUN set -ex; \ # build .deb files from upstream's source packages (which are verified by apt-get) nproc="$(nproc)"; \ export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \ -# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876 -# (and it "Depends: pgdg-keyring") - apt-get build-dep -y postgresql-common pgdg-keyring; \ - apt-get source --compile postgresql-common pgdg-keyring; \ +# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9 + apt-get build-dep -y postgresql-common-dev; \ + apt-get source --compile postgresql-common-dev; \ _update_repo; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ diff --git a/17/bookworm/Dockerfile b/17/bookworm/Dockerfile index eca1c04f03..25c2142f1f 100644 --- a/17/bookworm/Dockerfile +++ b/17/bookworm/Dockerfile @@ -131,10 +131,9 @@ RUN set -ex; \ # build .deb files from upstream's source packages (which are verified by apt-get) nproc="$(nproc)"; \ export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \ -# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876 -# (and it "Depends: pgdg-keyring") - apt-get build-dep -y postgresql-common pgdg-keyring; \ - apt-get source --compile postgresql-common pgdg-keyring; \ +# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9 + apt-get build-dep -y postgresql-common-dev; \ + apt-get source --compile postgresql-common-dev; \ _update_repo; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 90b92bba46..fc554d1fae 100644 --- a/17/bullseye/Dockerfile +++ b/17/bullseye/Dockerfile @@ -131,10 +131,9 @@ RUN set -ex; \ # build .deb files from upstream's source packages (which are verified by apt-get) nproc="$(nproc)"; \ export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \ -# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876 -# (and it "Depends: pgdg-keyring") - apt-get build-dep -y postgresql-common pgdg-keyring; \ - apt-get source --compile postgresql-common pgdg-keyring; \ +# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9 + apt-get build-dep -y postgresql-common-dev; \ + apt-get source --compile postgresql-common-dev; \ _update_repo; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 1ac04a725f..a81072a524 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -125,10 +125,9 @@ RUN set -ex; \ # build .deb files from upstream's source packages (which are verified by apt-get) nproc="$(nproc)"; \ export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \ -# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876 -# (and it "Depends: pgdg-keyring") - apt-get build-dep -y postgresql-common pgdg-keyring; \ - apt-get source --compile postgresql-common pgdg-keyring; \ +# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9 + apt-get build-dep -y postgresql-common-dev; \ + apt-get source --compile postgresql-common-dev; \ _update_repo; \ {{ if .major == 13 then ( -}} # we need DEBIAN_FRONTEND on postgresql-13 for slapd ("Please enter the password for the admin entry in your LDAP directory."); see https://bugs.debian.org/929417