From e8ebf74e50128123a8d0220b85e357ef2d73a7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?= Date: Wed, 19 May 2021 20:45:09 +0200 Subject: [PATCH] Add .sql.zst support to docker-entrypoint-initdb.d --- 10/alpine/Dockerfile | 7 +++---- 10/alpine/docker-entrypoint.sh | 9 +++++---- 10/bullseye/Dockerfile | 5 +---- 10/bullseye/docker-entrypoint.sh | 9 +++++---- 10/stretch/Dockerfile | 5 +---- 10/stretch/docker-entrypoint.sh | 9 +++++---- 11/alpine/Dockerfile | 7 +++---- 11/alpine/docker-entrypoint.sh | 9 +++++---- 11/bullseye/Dockerfile | 5 +---- 11/bullseye/docker-entrypoint.sh | 9 +++++---- 11/stretch/Dockerfile | 5 +---- 11/stretch/docker-entrypoint.sh | 9 +++++---- 12/alpine/Dockerfile | 7 +++---- 12/alpine/docker-entrypoint.sh | 9 +++++---- 12/bullseye/Dockerfile | 5 +---- 12/bullseye/docker-entrypoint.sh | 9 +++++---- 13/alpine/Dockerfile | 7 +++---- 13/alpine/docker-entrypoint.sh | 9 +++++---- 13/bullseye/Dockerfile | 5 +---- 13/bullseye/docker-entrypoint.sh | 9 +++++---- 14/alpine/Dockerfile | 7 +++---- 14/alpine/docker-entrypoint.sh | 9 +++++---- 14/bullseye/Dockerfile | 5 +---- 14/bullseye/docker-entrypoint.sh | 9 +++++---- Dockerfile-alpine.template | 7 +++---- Dockerfile-debian.template | 5 +---- docker-entrypoint.sh | 9 +++++---- 27 files changed, 91 insertions(+), 108 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 205bbb3ac5..5abaca5c38 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -54,15 +54,14 @@ RUN set -eux; \ make \ openldap-dev \ openssl-dev \ -# configure: error: prove not found - perl-utils \ -# configure: error: Perl module IPC::Run is required to run TAP tests - perl-ipc-run \ perl-dev \ + perl-ipc-run \ + perl-utils \ python3-dev \ tcl-dev \ util-linux-dev \ zlib-dev \ + zstd \ # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 icu-dev \ ; \ diff --git a/10/alpine/docker-entrypoint.sh b/10/alpine/docker-entrypoint.sh index 10ae166d5f..1d442631b6 100755 --- a/10/alpine/docker-entrypoint.sh +++ b/10/alpine/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/10/bullseye/Dockerfile b/10/bullseye/Dockerfile index a30f944695..1953d5ee63 100644 --- a/10/bullseye/Dockerfile +++ b/10/bullseye/Dockerfile @@ -64,12 +64,9 @@ ENV LANG en_US.utf8 RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ -# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift) -# https://github.com/docker-library/postgres/issues/359 -# https://cwrap.org/nss_wrapper.html libnss-wrapper \ -# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files xz-utils \ + zstd \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/10/bullseye/docker-entrypoint.sh b/10/bullseye/docker-entrypoint.sh index c02eb66a0f..09a756469d 100755 --- a/10/bullseye/docker-entrypoint.sh +++ b/10/bullseye/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 2e60a4abc1..9ba45976c6 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -64,12 +64,9 @@ ENV LANG en_US.utf8 RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ -# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift) -# https://github.com/docker-library/postgres/issues/359 -# https://cwrap.org/nss_wrapper.html libnss-wrapper \ -# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files xz-utils \ + zstd \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/10/stretch/docker-entrypoint.sh b/10/stretch/docker-entrypoint.sh index c02eb66a0f..09a756469d 100755 --- a/10/stretch/docker-entrypoint.sh +++ b/10/stretch/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index ba42834eb6..e8ad97a564 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -55,15 +55,14 @@ RUN set -eux; \ make \ openldap-dev \ openssl-dev \ -# configure: error: prove not found - perl-utils \ -# configure: error: Perl module IPC::Run is required to run TAP tests - perl-ipc-run \ perl-dev \ + perl-ipc-run \ + perl-utils \ python3-dev \ tcl-dev \ util-linux-dev \ zlib-dev \ + zstd \ # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 icu-dev \ ; \ diff --git a/11/alpine/docker-entrypoint.sh b/11/alpine/docker-entrypoint.sh index 10ae166d5f..1d442631b6 100755 --- a/11/alpine/docker-entrypoint.sh +++ b/11/alpine/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/11/bullseye/Dockerfile b/11/bullseye/Dockerfile index 5cf480b37d..a2e67d0903 100644 --- a/11/bullseye/Dockerfile +++ b/11/bullseye/Dockerfile @@ -64,12 +64,9 @@ ENV LANG en_US.utf8 RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ -# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift) -# https://github.com/docker-library/postgres/issues/359 -# https://cwrap.org/nss_wrapper.html libnss-wrapper \ -# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files xz-utils \ + zstd \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/11/bullseye/docker-entrypoint.sh b/11/bullseye/docker-entrypoint.sh index c02eb66a0f..09a756469d 100755 --- a/11/bullseye/docker-entrypoint.sh +++ b/11/bullseye/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index bd2c0c5a2f..d06db3d9a8 100644 --- a/11/stretch/Dockerfile +++ b/11/stretch/Dockerfile @@ -64,12 +64,9 @@ ENV LANG en_US.utf8 RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ -# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift) -# https://github.com/docker-library/postgres/issues/359 -# https://cwrap.org/nss_wrapper.html libnss-wrapper \ -# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files xz-utils \ + zstd \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/11/stretch/docker-entrypoint.sh b/11/stretch/docker-entrypoint.sh index c02eb66a0f..09a756469d 100755 --- a/11/stretch/docker-entrypoint.sh +++ b/11/stretch/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 7ca001be42..db51a794ec 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -55,15 +55,14 @@ RUN set -eux; \ make \ openldap-dev \ openssl-dev \ -# configure: error: prove not found - perl-utils \ -# configure: error: Perl module IPC::Run is required to run TAP tests - perl-ipc-run \ perl-dev \ + perl-ipc-run \ + perl-utils \ python3-dev \ tcl-dev \ util-linux-dev \ zlib-dev \ + zstd \ # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 icu-dev \ ; \ diff --git a/12/alpine/docker-entrypoint.sh b/12/alpine/docker-entrypoint.sh index 10ae166d5f..1d442631b6 100755 --- a/12/alpine/docker-entrypoint.sh +++ b/12/alpine/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/12/bullseye/Dockerfile b/12/bullseye/Dockerfile index 24bdb6fd53..481bf5b908 100644 --- a/12/bullseye/Dockerfile +++ b/12/bullseye/Dockerfile @@ -64,12 +64,9 @@ ENV LANG en_US.utf8 RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ -# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift) -# https://github.com/docker-library/postgres/issues/359 -# https://cwrap.org/nss_wrapper.html libnss-wrapper \ -# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files xz-utils \ + zstd \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/12/bullseye/docker-entrypoint.sh b/12/bullseye/docker-entrypoint.sh index c02eb66a0f..09a756469d 100755 --- a/12/bullseye/docker-entrypoint.sh +++ b/12/bullseye/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile index 038f5d341a..2e1ae7bb6c 100644 --- a/13/alpine/Dockerfile +++ b/13/alpine/Dockerfile @@ -55,15 +55,14 @@ RUN set -eux; \ make \ openldap-dev \ openssl-dev \ -# configure: error: prove not found - perl-utils \ -# configure: error: Perl module IPC::Run is required to run TAP tests - perl-ipc-run \ perl-dev \ + perl-ipc-run \ + perl-utils \ python3-dev \ tcl-dev \ util-linux-dev \ zlib-dev \ + zstd \ # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 icu-dev \ ; \ diff --git a/13/alpine/docker-entrypoint.sh b/13/alpine/docker-entrypoint.sh index 10ae166d5f..1d442631b6 100755 --- a/13/alpine/docker-entrypoint.sh +++ b/13/alpine/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/13/bullseye/Dockerfile b/13/bullseye/Dockerfile index 2cc6e62029..7b9e0aca8c 100644 --- a/13/bullseye/Dockerfile +++ b/13/bullseye/Dockerfile @@ -64,12 +64,9 @@ ENV LANG en_US.utf8 RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ -# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift) -# https://github.com/docker-library/postgres/issues/359 -# https://cwrap.org/nss_wrapper.html libnss-wrapper \ -# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files xz-utils \ + zstd \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/13/bullseye/docker-entrypoint.sh b/13/bullseye/docker-entrypoint.sh index c02eb66a0f..09a756469d 100755 --- a/13/bullseye/docker-entrypoint.sh +++ b/13/bullseye/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/14/alpine/Dockerfile b/14/alpine/Dockerfile index f644472e83..7e77b3aad7 100644 --- a/14/alpine/Dockerfile +++ b/14/alpine/Dockerfile @@ -55,15 +55,14 @@ RUN set -eux; \ make \ openldap-dev \ openssl-dev \ -# configure: error: prove not found - perl-utils \ -# configure: error: Perl module IPC::Run is required to run TAP tests - perl-ipc-run \ perl-dev \ + perl-ipc-run \ + perl-utils \ python3-dev \ tcl-dev \ util-linux-dev \ zlib-dev \ + zstd \ # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 icu-dev \ # https://www.postgresql.org/docs/14/release-14.html#id-1.11.6.5.5.3.7 diff --git a/14/alpine/docker-entrypoint.sh b/14/alpine/docker-entrypoint.sh index 10ae166d5f..1d442631b6 100755 --- a/14/alpine/docker-entrypoint.sh +++ b/14/alpine/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index baff4ca137..2f809c42de 100644 --- a/14/bullseye/Dockerfile +++ b/14/bullseye/Dockerfile @@ -64,12 +64,9 @@ ENV LANG en_US.utf8 RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ -# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift) -# https://github.com/docker-library/postgres/issues/359 -# https://cwrap.org/nss_wrapper.html libnss-wrapper \ -# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files xz-utils \ + zstd \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/14/bullseye/docker-entrypoint.sh b/14/bullseye/docker-entrypoint.sh index c02eb66a0f..09a756469d 100755 --- a/14/bullseye/docker-entrypoint.sh +++ b/14/bullseye/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index ee436f3948..f813707b07 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -51,15 +51,14 @@ RUN set -eux; \ make \ openldap-dev \ openssl-dev \ -# configure: error: prove not found - perl-utils \ -# configure: error: Perl module IPC::Run is required to run TAP tests - perl-ipc-run \ perl-dev \ + perl-ipc-run \ + perl-utils \ python3-dev \ tcl-dev \ util-linux-dev \ zlib-dev \ + zstd \ # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 icu-dev \ {{ if .major >= 14 then ( -}} diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index bcfa621d48..900bbe5cb3 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -58,12 +58,9 @@ ENV LANG en_US.utf8 RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ -# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift) -# https://github.com/docker-library/postgres/issues/359 -# https://cwrap.org/nss_wrapper.html libnss-wrapper \ -# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files xz-utils \ + zstd \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index c02eb66a0f..09a756469d 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -172,10 +172,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; - *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) echo "$0: ignoring $f" ;; + *.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) echo "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done