From b4604f5e16b852bc659ccdd9a992512b8439e187 Mon Sep 17 00:00:00 2001 From: Bjoern Hiller Date: Sat, 26 Mar 2022 08:18:47 +0100 Subject: [PATCH] Fix new zstd support for alpine images In e8ebf74e50128123a8d0220b85e357ef2d73a7ec 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. --- 10/alpine/Dockerfile | 2 +- 11/alpine/Dockerfile | 2 +- 12/alpine/Dockerfile | 2 +- 13/alpine/Dockerfile | 2 +- 14/alpine/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 5abaca5c38..ee4bfd7b3b 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -61,7 +61,6 @@ RUN set -eux; \ 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 \ ; \ @@ -127,6 +126,7 @@ RUN set -eux; \ # 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 tzdata \ + zstd \ ; \ apk del --no-network .build-deps; \ cd /; \ diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index e8ad97a564..81a4b09577 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -62,7 +62,6 @@ RUN set -eux; \ 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 \ ; \ @@ -129,6 +128,7 @@ RUN set -eux; \ # 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 tzdata \ + zstd \ ; \ apk del --no-network .build-deps; \ cd /; \ diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index db51a794ec..2e9df96b06 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -62,7 +62,6 @@ RUN set -eux; \ 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 \ ; \ @@ -129,6 +128,7 @@ RUN set -eux; \ # 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 tzdata \ + zstd \ ; \ apk del --no-network .build-deps; \ cd /; \ diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile index 2e1ae7bb6c..b3efb938ae 100644 --- a/13/alpine/Dockerfile +++ b/13/alpine/Dockerfile @@ -62,7 +62,6 @@ RUN set -eux; \ 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 \ ; \ @@ -129,6 +128,7 @@ RUN set -eux; \ # 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 tzdata \ + zstd \ ; \ apk del --no-network .build-deps; \ cd /; \ diff --git a/14/alpine/Dockerfile b/14/alpine/Dockerfile index 7e77b3aad7..d788983d82 100644 --- a/14/alpine/Dockerfile +++ b/14/alpine/Dockerfile @@ -62,7 +62,6 @@ RUN set -eux; \ 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 @@ -132,6 +131,7 @@ RUN set -eux; \ # 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 tzdata \ + zstd \ ; \ apk del --no-network .build-deps; \ cd /; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index f813707b07..f71ea8a8fe 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -58,7 +58,6 @@ RUN set -eux; \ 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 ( -}} @@ -134,6 +133,7 @@ RUN set -eux; \ # 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 tzdata \ + zstd \ ; \ apk del --no-network .build-deps; \ cd /; \