Skip to content

Commit d9c4773

Browse files
yosifkityosifkit
committed
Update apt build depend
1 parent 437897c commit d9c4773

File tree

11 files changed

+33
-44
lines changed

11 files changed

+33
-44
lines changed

‎13/bookworm/Dockerfile

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎13/bullseye/Dockerfile

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎14/bookworm/Dockerfile

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎14/bullseye/Dockerfile

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎15/bookworm/Dockerfile

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎15/bullseye/Dockerfile

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎16/bookworm/Dockerfile

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎16/bullseye/Dockerfile

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎17/bookworm/Dockerfile

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎17/bullseye/Dockerfile

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dockerfile-debian.template

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,9 @@ RUN set -ex; \
125125
# build .deb files from upstream's source packages (which are verified by apt-get)
126126
nproc="$(nproc)"; \
127127
export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \
128-
# 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
129-
# (and it "Depends: pgdg-keyring")
130-
apt-get build-dep -y postgresql-common pgdg-keyring; \
131-
apt-get source --compile postgresql-common pgdg-keyring; \
128+
# 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
129+
apt-get build-dep -y postgresql-common-dev; \
130+
apt-get source --compile postgresql-common-dev; \
132131
_update_repo; \
133132
{{ if .major == 13 then ( -}}
134133
# 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

0 commit comments

Comments
 (0)