diff --git a/5.7/Dockerfile.debian b/5.7/Dockerfile.debian index 7da445782..24baf6425 100644 --- a/5.7/Dockerfile.debian +++ b/5.7/Dockerfile.debian @@ -46,8 +46,8 @@ RUN set -eux; \ # Sys::Hostname # Data::Dumper perl \ -# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files xz-utils \ + zstd \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/5.7/Dockerfile.oracle b/5.7/Dockerfile.oracle index ea4d58744..c8c07fab3 100644 --- a/5.7/Dockerfile.oracle +++ b/5.7/Dockerfile.oracle @@ -43,6 +43,7 @@ RUN set -eux; \ gzip \ openssl \ xz \ + zstd \ ; \ yum clean all diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh index ba9c3ce51..adbbf06ee 100755 --- a/5.7/docker-entrypoint.sh +++ b/5.7/docker-entrypoint.sh @@ -72,10 +72,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) mysql_note "$0: running $f"; docker_process_sql < "$f"; echo ;; - *.sql.gz) mysql_note "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) mysql_note "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) mysql_warn "$0: ignoring $f" ;; + *.sql) mysql_note "$0: running $f"; docker_process_sql < "$f"; echo ;; + *.sql.gz) mysql_note "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) mysql_note "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) mysql_note "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) mysql_warn "$0: ignoring $f" ;; esac echo done diff --git a/8.0/Dockerfile.debian b/8.0/Dockerfile.debian index 6c308f283..9eb30998f 100644 --- a/8.0/Dockerfile.debian +++ b/8.0/Dockerfile.debian @@ -46,8 +46,8 @@ RUN set -eux; \ # Sys::Hostname # Data::Dumper perl \ -# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files xz-utils \ + zstd \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/8.0/Dockerfile.oracle b/8.0/Dockerfile.oracle index 9b517fc38..556bb5ffa 100644 --- a/8.0/Dockerfile.oracle +++ b/8.0/Dockerfile.oracle @@ -43,6 +43,7 @@ RUN set -eux; \ gzip \ openssl \ xz \ + zstd \ # Oracle Linux 8+ is very slim :) findutils \ ; \ diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh index ba9c3ce51..adbbf06ee 100755 --- a/8.0/docker-entrypoint.sh +++ b/8.0/docker-entrypoint.sh @@ -72,10 +72,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) mysql_note "$0: running $f"; docker_process_sql < "$f"; echo ;; - *.sql.gz) mysql_note "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) mysql_note "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) mysql_warn "$0: ignoring $f" ;; + *.sql) mysql_note "$0: running $f"; docker_process_sql < "$f"; echo ;; + *.sql.gz) mysql_note "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) mysql_note "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) mysql_note "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) mysql_warn "$0: ignoring $f" ;; esac echo done diff --git a/template/Dockerfile.debian b/template/Dockerfile.debian index cb4cad805..7fc0a3dc4 100644 --- a/template/Dockerfile.debian +++ b/template/Dockerfile.debian @@ -40,8 +40,8 @@ RUN set -eux; \ # Sys::Hostname # Data::Dumper perl \ -# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files xz-utils \ + zstd \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/template/Dockerfile.oracle b/template/Dockerfile.oracle index 93d660a0d..a58e5c1f3 100644 --- a/template/Dockerfile.oracle +++ b/template/Dockerfile.oracle @@ -38,6 +38,7 @@ RUN set -eux; \ gzip \ openssl \ xz \ + zstd \ {{ if .oracle.variant | startswith("7") then "" else ( -}} # Oracle Linux 8+ is very slim :) findutils \ diff --git a/template/docker-entrypoint.sh b/template/docker-entrypoint.sh index ba9c3ce51..adbbf06ee 100755 --- a/template/docker-entrypoint.sh +++ b/template/docker-entrypoint.sh @@ -72,10 +72,11 @@ docker_process_init_files() { . "$f" fi ;; - *.sql) mysql_note "$0: running $f"; docker_process_sql < "$f"; echo ;; - *.sql.gz) mysql_note "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) mysql_note "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) mysql_warn "$0: ignoring $f" ;; + *.sql) mysql_note "$0: running $f"; docker_process_sql < "$f"; echo ;; + *.sql.gz) mysql_note "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) mysql_note "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) mysql_note "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) mysql_warn "$0: ignoring $f" ;; esac echo done