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

Also add "clang-6.0" explicitly on stretch builds of 11+ 

See e914bb060a (and the Dockerfile comment).
This commit is contained in:
Tianon Gravi 2022-02-11 16:50:10 -08:00
parent 6ef8010b6e
commit 72e336d9d3
10 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
10/bullseye/Dockerfile generated
View File

@ -110,11 +110,11 @@ RUN set -ex; \
# let's build binaries from their published source packages
echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
tempDir="$(mktemp -d)"; \
cd "$tempDir"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
apt-get update; \
apt-get install -y --no-install-recommends dpkg-dev; \

4
10/stretch/Dockerfile generated
View File

@ -110,11 +110,11 @@ RUN set -ex; \
# let's build binaries from their published source packages
echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
tempDir="$(mktemp -d)"; \
cd "$tempDir"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
apt-get update; \
apt-get install -y --no-install-recommends dpkg-dev; \

4
11/bullseye/Dockerfile generated
View File

@ -110,11 +110,11 @@ RUN set -ex; \
# let's build binaries from their published source packages
echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
tempDir="$(mktemp -d)"; \
cd "$tempDir"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
apt-get update; \
apt-get install -y --no-install-recommends dpkg-dev; \

7
11/stretch/Dockerfile generated
View File

@ -110,14 +110,17 @@ RUN set -ex; \
# let's build binaries from their published source packages
echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
# https://github.com/docker-library/postgres/issues/484 (clang-6.0 required, only available in stretch-backports)
echo 'deb http://deb.debian.org/debian stretch-backports main' >> /etc/apt/sources.list.d/pgdg.list; \
# ... and thanks to https://salsa.debian.org/postgresql/postgresql/-/commit/e914bb060a9b58dae661f1c3439de5ffe4ba62d0 it doesn't get pulled in automatically any more (but if we install it manually it gets used by the build appropriately 🙈)
apt-get update; \
apt-get install -y --no-install-recommends clang-6.0; \
\
tempDir="$(mktemp -d)"; \
cd "$tempDir"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
apt-get update; \
apt-get install -y --no-install-recommends dpkg-dev; \

4
12/bullseye/Dockerfile generated
View File

@ -110,11 +110,11 @@ RUN set -ex; \
# let's build binaries from their published source packages
echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
tempDir="$(mktemp -d)"; \
cd "$tempDir"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
apt-get update; \
apt-get install -y --no-install-recommends dpkg-dev; \

4
13/bullseye/Dockerfile generated
View File

@ -110,11 +110,11 @@ RUN set -ex; \
# let's build binaries from their published source packages
echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
tempDir="$(mktemp -d)"; \
cd "$tempDir"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
apt-get update; \
apt-get install -y --no-install-recommends dpkg-dev; \

4
14/bullseye/Dockerfile generated
View File

@ -110,11 +110,11 @@ RUN set -ex; \
# let's build binaries from their published source packages
echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
tempDir="$(mktemp -d)"; \
cd "$tempDir"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
apt-get update; \
apt-get install -y --no-install-recommends dpkg-dev; \

4
9.6/bullseye/Dockerfile generated
View File

@ -110,11 +110,11 @@ RUN set -ex; \
# let's build binaries from their published source packages
echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
tempDir="$(mktemp -d)"; \
cd "$tempDir"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
apt-get update; \
apt-get install -y --no-install-recommends dpkg-dev; \

4
9.6/stretch/Dockerfile generated
View File

@ -110,11 +110,11 @@ RUN set -ex; \
# let's build binaries from their published source packages
echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
tempDir="$(mktemp -d)"; \
cd "$tempDir"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
apt-get update; \
apt-get install -y --no-install-recommends dpkg-dev; \

7
Dockerfile-debian.template
View File

@ -104,16 +104,19 @@ RUN set -ex; \
# let's build binaries from their published source packages
echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
{{ if env.variant == "stretch" and .major >= 11 then ( -}}
# https://github.com/docker-library/postgres/issues/484 (clang-6.0 required, only available in stretch-backports)
echo 'deb http://deb.debian.org/debian {{ env.variant }}-backports main' >> /etc/apt/sources.list.d/pgdg.list; \
# ... and thanks to https://salsa.debian.org/postgresql/postgresql/-/commit/e914bb060a9b58dae661f1c3439de5ffe4ba62d0 it doesn't get pulled in automatically any more (but if we install it manually it gets used by the build appropriately 🙈)
apt-get update; \
apt-get install -y --no-install-recommends clang-6.0; \
\
{{ ) else "" end -}}
tempDir="$(mktemp -d)"; \
cd "$tempDir"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
apt-get update; \
apt-get install -y --no-install-recommends dpkg-dev; \