Merge pull request #773 from hectorm/zst-files

Add .sql.zst support to docker-entrypoint-initdb.d
docker-library · Mar 7, 2022 · 623e46a · 623e46a
2 parents 37981f6 + 546838a
commit 623e46a
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 15 deletions.
diff --git a/5.7/Dockerfile.debian b/5.7/Dockerfile.debian
diff --git a/5.7/Dockerfile.oracle b/5.7/Dockerfile.oracle
diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh
diff --git a/8.0/Dockerfile.debian b/8.0/Dockerfile.debian
diff --git a/8.0/Dockerfile.oracle b/8.0/Dockerfile.oracle
diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh
diff --git 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
@@ -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
@@ -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