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

Fix new zstd support for alpine images

Browse Source 
In e8ebf74e50 zstd was installed as build
dependency and thus does not end up in the final image which in turn
renders docker-entrypoint.sh broken when using *.sql.zst files.
This commit is contained in:
Bjoern Hiller
2022-03-26 08:18:47 +01:00
parent d80a8db9e3
commit b4604f5e16
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
10/alpine/Dockerfile generated
View File

@ -61,7 +61,6 @@ RUN set -eux; \
tcl-dev \ tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
zstd \
# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
icu-dev \ icu-dev \
; \ ; \
@ -127,6 +126,7 @@ RUN set -eux; \
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation: # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
tzdata \ tzdata \
zstd \
; \ ; \
apk del --no-network .build-deps; \ apk del --no-network .build-deps; \
cd /; \ cd /; \

2
11/alpine/Dockerfile generated
View File

@ -62,7 +62,6 @@ RUN set -eux; \
tcl-dev \ tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
zstd \
# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
icu-dev \ icu-dev \
; \ ; \
@ -129,6 +128,7 @@ RUN set -eux; \
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation: # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
tzdata \ tzdata \
zstd \
; \ ; \
apk del --no-network .build-deps; \ apk del --no-network .build-deps; \
cd /; \ cd /; \

2
12/alpine/Dockerfile generated
View File

@ -62,7 +62,6 @@ RUN set -eux; \
tcl-dev \ tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
zstd \
# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
icu-dev \ icu-dev \
; \ ; \
@ -129,6 +128,7 @@ RUN set -eux; \
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation: # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
tzdata \ tzdata \
zstd \
; \ ; \
apk del --no-network .build-deps; \ apk del --no-network .build-deps; \
cd /; \ cd /; \

2
13/alpine/Dockerfile generated
View File

@ -62,7 +62,6 @@ RUN set -eux; \
tcl-dev \ tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
zstd \
# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
icu-dev \ icu-dev \
; \ ; \
@ -129,6 +128,7 @@ RUN set -eux; \
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation: # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
tzdata \ tzdata \
zstd \
; \ ; \
apk del --no-network .build-deps; \ apk del --no-network .build-deps; \
cd /; \ cd /; \

2
14/alpine/Dockerfile generated
View File

@ -62,7 +62,6 @@ RUN set -eux; \
tcl-dev \ tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
zstd \
# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
icu-dev \ icu-dev \
# https://www.postgresql.org/docs/14/release-14.html#id-1.11.6.5.5.3.7 # https://www.postgresql.org/docs/14/release-14.html#id-1.11.6.5.5.3.7
@ -132,6 +131,7 @@ RUN set -eux; \
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation: # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
tzdata \ tzdata \
zstd \
; \ ; \
apk del --no-network .build-deps; \ apk del --no-network .build-deps; \
cd /; \ cd /; \

2
Dockerfile-alpine.template
View File

@ -58,7 +58,6 @@ RUN set -eux; \
tcl-dev \ tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
zstd \
# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
icu-dev \ icu-dev \
{{ if .major >= 14 then ( -}} {{ if .major >= 14 then ( -}}
@ -134,6 +133,7 @@ RUN set -eux; \
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation: # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
tzdata \ tzdata \
zstd \
; \ ; \
apk del --no-network .build-deps; \ apk del --no-network .build-deps; \
cd /; \ cd /; \