Only install 18+ JIT package on architectures where it's supported
See: -eaa9529d8e"Make LLVM architectures a inclusion list so it works in the Architecture field." (which removes i386, notably) -1d6f624592"Disable JIT on loong64 and riscv64 again, still segfaulting."
This commit is contained in:
parent
6ec0e42428
commit
46e8474a6e
|
|
@ -156,9 +156,11 @@ RUN set -ex; \
|
|||
sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
"postgresql-$PG_MAJOR=$PG_VERSION" \
|
||||
# https://github.com/docker-library/postgres/pull/1344#issuecomment-2936578203 (JIT is a separate package in 18+)
|
||||
"postgresql-$PG_MAJOR-jit=$PG_VERSION" \
|
||||
; \
|
||||
# https://github.com/docker-library/postgres/pull/1344#issuecomment-2936578203 (JIT is a separate package in 18+, but only supported for a subset of architectures)
|
||||
if apt-get install -s "postgresql-$PG_MAJOR-jit" > /dev/null 2>&1; then \
|
||||
apt-get install -y --no-install-recommends "postgresql-$PG_MAJOR-jit=$PG_VERSION"; \
|
||||
fi; \
|
||||
\
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
|
|
|
|||
|
|
@ -156,9 +156,11 @@ RUN set -ex; \
|
|||
sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
"postgresql-$PG_MAJOR=$PG_VERSION" \
|
||||
# https://github.com/docker-library/postgres/pull/1344#issuecomment-2936578203 (JIT is a separate package in 18+)
|
||||
"postgresql-$PG_MAJOR-jit=$PG_VERSION" \
|
||||
; \
|
||||
# https://github.com/docker-library/postgres/pull/1344#issuecomment-2936578203 (JIT is a separate package in 18+, but only supported for a subset of architectures)
|
||||
if apt-get install -s "postgresql-$PG_MAJOR-jit" > /dev/null 2>&1; then \
|
||||
apt-get install -y --no-install-recommends "postgresql-$PG_MAJOR-jit=$PG_VERSION"; \
|
||||
fi; \
|
||||
\
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
|
|
|
|||
|
|
@ -154,11 +154,13 @@ RUN set -ex; \
|
|||
sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
"postgresql-$PG_MAJOR=$PG_VERSION" \
|
||||
{{ if .major >= 18 then ( -}}
|
||||
# https://github.com/docker-library/postgres/pull/1344#issuecomment-2936578203 (JIT is a separate package in 18+)
|
||||
"postgresql-$PG_MAJOR-jit=$PG_VERSION" \
|
||||
{{ ) else "" end -}}
|
||||
; \
|
||||
{{ if .major >= 18 then ( -}}
|
||||
# https://github.com/docker-library/postgres/pull/1344#issuecomment-2936578203 (JIT is a separate package in 18+, but only supported for a subset of architectures)
|
||||
if apt-get install -s "postgresql-$PG_MAJOR-jit" > /dev/null 2>&1; then \
|
||||
apt-get install -y --no-install-recommends "postgresql-$PG_MAJOR-jit=$PG_VERSION"; \
|
||||
fi; \
|
||||
{{ ) else "" end -}}
|
||||
\
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
|
|
|
|||
Loading…
Reference in New Issue