docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-07-28 10:42:06 +03:00
Code Activity

Add workaround for https://bugs.debian.org/929417 when building 13 from source

Browse Source
This commit is contained in:
Tianon Gravi
2020-05-21 14:26:23 -07:00
parent 8c3f661c5b
commit 682ff83c5c
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
13/Dockerfile
View File

@ -118,6 +118,8 @@ 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)
apt-get update; \ apt-get update; \
# 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 \
apt-get build-dep -y \ apt-get build-dep -y \
postgresql-common pgdg-keyring \ postgresql-common pgdg-keyring \
"postgresql-$PG_MAJOR=$PG_VERSION" \ "postgresql-$PG_MAJOR=$PG_VERSION" \

2
Dockerfile-debian.template
View File

@ -118,6 +118,8 @@ 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)
apt-get update; \ apt-get update; \
# 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 \
apt-get build-dep -y \ apt-get build-dep -y \
postgresql-common pgdg-keyring \ postgresql-common pgdg-keyring \
"postgresql-$PG_MAJOR=$PG_VERSION" \ "postgresql-$PG_MAJOR=$PG_VERSION" \

4
update.sh
View File

@ -125,6 +125,10 @@ for version in "${versions[@]}"; do
sed -i -e '/postgresql-contrib-/d' "$version/Dockerfile" sed -i -e '/postgresql-contrib-/d' "$version/Dockerfile"
fi fi
if [ "$majorVersion" != '13' ]; then
sed -i -e '/DEBIAN_FRONTEND/d' "$version/Dockerfile"
fi
# TODO figure out what to do with odd version numbers here, like release candidates # TODO figure out what to do with odd version numbers here, like release candidates
srcVersion="${fullVersion%%-*}" srcVersion="${fullVersion%%-*}"
# change "10~beta1" to "10beta1" for ftp urls # change "10~beta1" to "10beta1" for ftp urls