docker-library
/
postgres
mirror of https://github.com/docker-library/postgres.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1341 from infosiftr/drop-pgdg-keyring 

Update apt build depend
This commit is contained in:
Tianon Gravi 2025-05-22 09:25:57 -07:00 committed by GitHub
parent 437897caba d9c4773ca5
commit 833dab59cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 33 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
13/bookworm/Dockerfile generated
View File

@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get) # build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \ nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$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 # 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
# (and it "Depends: pgdg-keyring") apt-get build-dep -y postgresql-common-dev; \
apt-get build-dep -y postgresql-common pgdg-keyring; \ apt-get source --compile postgresql-common-dev; \
apt-get source --compile postgresql-common pgdg-keyring; \
_update_repo; \ _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 # 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 \ DEBIAN_FRONTEND=noninteractive \

7
13/bullseye/Dockerfile generated
View File

@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get) # build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \ nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$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 # 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
# (and it "Depends: pgdg-keyring") apt-get build-dep -y postgresql-common-dev; \
apt-get build-dep -y postgresql-common pgdg-keyring; \ apt-get source --compile postgresql-common-dev; \
apt-get source --compile postgresql-common pgdg-keyring; \
_update_repo; \ _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 # 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 \ DEBIAN_FRONTEND=noninteractive \

7
14/bookworm/Dockerfile generated
View File

@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get) # build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \ nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$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 # 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
# (and it "Depends: pgdg-keyring") apt-get build-dep -y postgresql-common-dev; \
apt-get build-dep -y postgresql-common pgdg-keyring; \ apt-get source --compile postgresql-common-dev; \
apt-get source --compile postgresql-common pgdg-keyring; \
_update_repo; \ _update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \

7
14/bullseye/Dockerfile generated
View File

@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get) # build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \ nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$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 # 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
# (and it "Depends: pgdg-keyring") apt-get build-dep -y postgresql-common-dev; \
apt-get build-dep -y postgresql-common pgdg-keyring; \ apt-get source --compile postgresql-common-dev; \
apt-get source --compile postgresql-common pgdg-keyring; \
_update_repo; \ _update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \

7
15/bookworm/Dockerfile generated
View File

@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get) # build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \ nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$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 # 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
# (and it "Depends: pgdg-keyring") apt-get build-dep -y postgresql-common-dev; \
apt-get build-dep -y postgresql-common pgdg-keyring; \ apt-get source --compile postgresql-common-dev; \
apt-get source --compile postgresql-common pgdg-keyring; \
_update_repo; \ _update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \

7
15/bullseye/Dockerfile generated
View File

@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get) # build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \ nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$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 # 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
# (and it "Depends: pgdg-keyring") apt-get build-dep -y postgresql-common-dev; \
apt-get build-dep -y postgresql-common pgdg-keyring; \ apt-get source --compile postgresql-common-dev; \
apt-get source --compile postgresql-common pgdg-keyring; \
_update_repo; \ _update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \

7
16/bookworm/Dockerfile generated
View File

@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get) # build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \ nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$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 # 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
# (and it "Depends: pgdg-keyring") apt-get build-dep -y postgresql-common-dev; \
apt-get build-dep -y postgresql-common pgdg-keyring; \ apt-get source --compile postgresql-common-dev; \
apt-get source --compile postgresql-common pgdg-keyring; \
_update_repo; \ _update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \

7
16/bullseye/Dockerfile generated
View File

@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get) # build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \ nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$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 # 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
# (and it "Depends: pgdg-keyring") apt-get build-dep -y postgresql-common-dev; \
apt-get build-dep -y postgresql-common pgdg-keyring; \ apt-get source --compile postgresql-common-dev; \
apt-get source --compile postgresql-common pgdg-keyring; \
_update_repo; \ _update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \

7
17/bookworm/Dockerfile generated
View File

@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get) # build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \ nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$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 # 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
# (and it "Depends: pgdg-keyring") apt-get build-dep -y postgresql-common-dev; \
apt-get build-dep -y postgresql-common pgdg-keyring; \ apt-get source --compile postgresql-common-dev; \
apt-get source --compile postgresql-common pgdg-keyring; \
_update_repo; \ _update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \

7
17/bullseye/Dockerfile generated
View File

@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get) # build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \ nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$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 # 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
# (and it "Depends: pgdg-keyring") apt-get build-dep -y postgresql-common-dev; \
apt-get build-dep -y postgresql-common pgdg-keyring; \ apt-get source --compile postgresql-common-dev; \
apt-get source --compile postgresql-common pgdg-keyring; \
_update_repo; \ _update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \ apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \

7
Dockerfile-debian.template
View File

@ -125,10 +125,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get) # build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \ nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$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 # 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
# (and it "Depends: pgdg-keyring") apt-get build-dep -y postgresql-common-dev; \
apt-get build-dep -y postgresql-common pgdg-keyring; \ apt-get source --compile postgresql-common-dev; \
apt-get source --compile postgresql-common pgdg-keyring; \
_update_repo; \ _update_repo; \
{{ if .major == 13 then ( -}} {{ 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 # 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