-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update mysql #11997
Merged
Merged
Update mysql #11997
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/mysql@623e46a: Merge pull request docker-library/mysql#773 from hectorm/zst-files - docker-library/mysql@546838a: Add .sql.zst support to docker-entrypoint-initdb.d
Diff for 8929ea3:diff --git a/_bashbrew-cat b/_bashbrew-cat
index d3d451c..3bd1718 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,22 +2,22 @@ Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <yosi
GitRepo: https://github.com/docker-library/mysql.git
Tags: 5.7.37, 5.7, 5, 5.7.37-debian, 5.7-debian, 5-debian
-GitCommit: 9e0c503080ea8ab2e55bbca26d917eee3f5f942a
+GitCommit: 546838ab256ad36a9f6571e900deb7c4040cd383
Directory: 5.7
File: Dockerfile.debian
Tags: 5.7.37-oracle, 5.7-oracle, 5-oracle
-GitCommit: 37981f652a98b8fc26f487be9eda167de4689d84
+GitCommit: 546838ab256ad36a9f6571e900deb7c4040cd383
Directory: 5.7
File: Dockerfile.oracle
Tags: 8.0.28, 8.0, 8, latest, 8.0.28-debian, 8.0-debian, 8-debian, debian
-GitCommit: 9e0c503080ea8ab2e55bbca26d917eee3f5f942a
+GitCommit: 546838ab256ad36a9f6571e900deb7c4040cd383
Directory: 8.0
File: Dockerfile.debian
Tags: 8.0.28-oracle, 8.0-oracle, 8-oracle, oracle
Architectures: amd64, arm64v8
-GitCommit: 37981f652a98b8fc26f487be9eda167de4689d84
+GitCommit: 546838ab256ad36a9f6571e900deb7c4040cd383
Directory: 8.0
File: Dockerfile.oracle
diff --git a/mysql_5-debian/Dockerfile.debian b/mysql_5-debian/Dockerfile.debian
index 7da4457..24baf64 100644
--- a/mysql_5-debian/Dockerfile.debian
+++ b/mysql_5-debian/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/mysql_5-debian/docker-entrypoint.sh b/mysql_5-debian/docker-entrypoint.sh
index ba9c3ce..adbbf06 100755
--- a/mysql_5-debian/docker-entrypoint.sh
+++ b/mysql_5-debian/docker-entrypoint.sh
@@ -75,6 +75,7 @@ docker_process_init_files() {
*.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
diff --git a/mysql_5-oracle/Dockerfile.oracle b/mysql_5-oracle/Dockerfile.oracle
index ea4d587..c8c07fa 100644
--- a/mysql_5-oracle/Dockerfile.oracle
+++ b/mysql_5-oracle/Dockerfile.oracle
@@ -43,6 +43,7 @@ RUN set -eux; \
gzip \
openssl \
xz \
+ zstd \
; \
yum clean all
diff --git a/mysql_5-oracle/docker-entrypoint.sh b/mysql_5-oracle/docker-entrypoint.sh
index ba9c3ce..adbbf06 100755
--- a/mysql_5-oracle/docker-entrypoint.sh
+++ b/mysql_5-oracle/docker-entrypoint.sh
@@ -75,6 +75,7 @@ docker_process_init_files() {
*.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
diff --git a/mysql_debian/Dockerfile.debian b/mysql_debian/Dockerfile.debian
index 6c308f2..9eb3099 100644
--- a/mysql_debian/Dockerfile.debian
+++ b/mysql_debian/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/mysql_debian/docker-entrypoint.sh b/mysql_debian/docker-entrypoint.sh
index ba9c3ce..adbbf06 100755
--- a/mysql_debian/docker-entrypoint.sh
+++ b/mysql_debian/docker-entrypoint.sh
@@ -75,6 +75,7 @@ docker_process_init_files() {
*.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
diff --git a/mysql_oracle/Dockerfile.oracle b/mysql_oracle/Dockerfile.oracle
index 9b517fc..556bb5f 100644
--- a/mysql_oracle/Dockerfile.oracle
+++ b/mysql_oracle/Dockerfile.oracle
@@ -43,6 +43,7 @@ RUN set -eux; \
gzip \
openssl \
xz \
+ zstd \
# Oracle Linux 8+ is very slim :)
findutils \
; \
diff --git a/mysql_oracle/docker-entrypoint.sh b/mysql_oracle/docker-entrypoint.sh
index ba9c3ce..adbbf06 100755
--- a/mysql_oracle/docker-entrypoint.sh
+++ b/mysql_oracle/docker-entrypoint.sh
@@ -75,6 +75,7 @@ docker_process_init_files() {
*.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 Relevant Maintainers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: