Skip to content

Commit 72e336d

Browse files
tianontianon
committed
Also add "clang-6.0" explicitly on stretch builds of 11+
See https://salsa.debian.org/postgresql/postgresql/-/commit/e914bb060a9b58dae661f1c3439de5ffe4ba62d0 (and the Dockerfile comment).
1 parent 6ef8010 commit 72e336d

File tree

10 files changed

+26
-20
lines changed

10 files changed

+26
-20
lines changed

‎10/bullseye/Dockerfile

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

‎10/stretch/Dockerfile

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

‎11/bullseye/Dockerfile

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

‎11/stretch/Dockerfile

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

‎12/bullseye/Dockerfile

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

‎13/bullseye/Dockerfile

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

‎14/bullseye/Dockerfile

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

‎9.6/bullseye/Dockerfile

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

‎9.6/stretch/Dockerfile

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

‎Dockerfile-debian.template

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,19 @@ RUN set -ex; \
104104
# let's build binaries from their published source packages
105105
echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
106106
\
107+
savedAptMark="$(apt-mark showmanual)"; \
108+
\
107109
{{ if env.variant == "stretch" and .major >= 11 then ( -}}
108110
# https://github.com/docker-library/postgres/issues/484 (clang-6.0 required, only available in stretch-backports)
109111
echo 'deb http://deb.debian.org/debian {{ env.variant }}-backports main' >> /etc/apt/sources.list.d/pgdg.list; \
112+
# ... 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 🙈)
113+
apt-get update; \
114+
apt-get install -y --no-install-recommends clang-6.0; \
110115
\
111116
{{ ) else "" end -}}
112117
tempDir="$(mktemp -d)"; \
113118
cd "$tempDir"; \
114119
\
115-
savedAptMark="$(apt-mark showmanual)"; \
116-
\
117120
# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
118121
apt-get update; \
119122
apt-get install -y --no-install-recommends dpkg-dev; \

0 commit comments

Comments
 (0)