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
MariaDB 2024 Q1 part 2 release #16284
Merged
yosifkit
merged 2 commits into
docker-library:master
from
grooverdan:mariadb_2024_q1_p2
Feb 20, 2024
Merged
MariaDB 2024 Q1 part 2 release #16284
yosifkit
merged 2 commits into
docker-library:master
from
grooverdan:mariadb_2024_q1_p2
Feb 20, 2024
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
11.3.2 is stable 11.4.1 is RC
This comment has been minimized.
This comment has been minimized.
MariaDB-11.4 added a default self-signed TLS cert. With this in the cases where there is no secure password there will be a TLS error. By setting the password, the connection can continue. Adding the password is compatible with MySQL and equivalents.
Diff for 949c7df:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9568b27..6b37338 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -31,12 +31,17 @@ Architectures: amd64, arm64v8, ppc64le, s390x
GitCommit: 1d95dfc811b0666ab39cecdbf88c4d956e74f765
Directory: 11.1
-Tags: 11.2.3-jammy, 11.2-jammy, 11-jammy, jammy, 11.2.3, 11.2, 11, latest
+Tags: 11.2.3-jammy, 11.2-jammy, 11.2.3, 11.2
Architectures: amd64, arm64v8, ppc64le, s390x
GitCommit: 1d95dfc811b0666ab39cecdbf88c4d956e74f765
Directory: 11.2
-Tags: 11.3.1-rc-jammy, 11.3-rc-jammy, 11.3.1-rc, 11.3-rc
+Tags: 11.3.2-jammy, 11.3-jammy, 11-jammy, jammy, 11.3.2, 11.3, 11, latest
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: f64d0cd1176b78c8a42a219fdf0b5c54a12b3c6d
+GitCommit: 0c710468e3fb2ccec6cdc14350ee0f1eaf668307
Directory: 11.3
+
+Tags: 11.4.1-rc-jammy, 11.4-rc-jammy, 11.4.1-rc, 11.4-rc
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 174b68b5ef90f92902c15d73a0cfdd1cb99146d8
+Directory: 11.4
diff --git a/_bashbrew-list b/_bashbrew-list
index 2378566..8b438b9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -30,10 +30,14 @@ mariadb:11.2
mariadb:11.2-jammy
mariadb:11.2.3
mariadb:11.2.3-jammy
-mariadb:11.3-rc
-mariadb:11.3-rc-jammy
-mariadb:11.3.1-rc
-mariadb:11.3.1-rc-jammy
+mariadb:11.3
+mariadb:11.3-jammy
+mariadb:11.3.2
+mariadb:11.3.2-jammy
+mariadb:11.4-rc
+mariadb:11.4-rc-jammy
+mariadb:11.4.1-rc
+mariadb:11.4.1-rc-jammy
mariadb:jammy
mariadb:latest
mariadb:lts
diff --git a/mariadb_latest/Dockerfile b/mariadb_11.2/Dockerfile
similarity index 100%
copy from mariadb_latest/Dockerfile
copy to mariadb_11.2/Dockerfile
diff --git a/mariadb_11.3-rc/docker-entrypoint.sh b/mariadb_11.2/docker-entrypoint.sh
similarity index 100%
rename from mariadb_11.3-rc/docker-entrypoint.sh
rename to mariadb_11.2/docker-entrypoint.sh
diff --git a/mariadb_11.3-rc/healthcheck.sh b/mariadb_11.2/healthcheck.sh
similarity index 100%
rename from mariadb_11.3-rc/healthcheck.sh
rename to mariadb_11.2/healthcheck.sh
diff --git a/mariadb_11.3-rc/Dockerfile b/mariadb_11.4-rc/Dockerfile
similarity index 97%
rename from mariadb_11.3-rc/Dockerfile
rename to mariadb_11.4-rc/Dockerfile
index 13b08c3..575013f 100644
--- a/mariadb_11.3-rc/Dockerfile
+++ b/mariadb_11.4-rc/Dockerfile
@@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
org.opencontainers.image.licenses="GPL-2.0" \
org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
org.opencontainers.image.vendor="MariaDB Community" \
- org.opencontainers.image.version="11.3.1" \
+ org.opencontainers.image.version="11.4.1" \
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
# bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:11.3.1+maria~ubu2204
+ARG MARIADB_VERSION=1:11.4.1+maria~ubu2204
ENV MARIADB_VERSION $MARIADB_VERSION
# release-status:RC
# release-support-type:Short Term Support
# (https://downloads.mariadb.org/rest-api/mariadb/)
# Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.3.1/repo/ubuntu/ jammy main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.4.1/repo/ubuntu/ jammy main main/debug"
RUN set -e;\
echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
diff --git a/mariadb_11.0/docker-entrypoint.sh b/mariadb_11.4-rc/docker-entrypoint.sh
similarity index 100%
copy from mariadb_11.0/docker-entrypoint.sh
copy to mariadb_11.4-rc/docker-entrypoint.sh
diff --git a/mariadb_11.0/healthcheck.sh b/mariadb_11.4-rc/healthcheck.sh
similarity index 100%
copy from mariadb_11.0/healthcheck.sh
copy to mariadb_11.4-rc/healthcheck.sh
diff --git a/mariadb_latest/Dockerfile b/mariadb_latest/Dockerfile
index fb3a553..45acd7e 100644
--- a/mariadb_latest/Dockerfile
+++ b/mariadb_latest/Dockerfile
@@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
org.opencontainers.image.licenses="GPL-2.0" \
org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
org.opencontainers.image.vendor="MariaDB Community" \
- org.opencontainers.image.version="11.2.3" \
+ org.opencontainers.image.version="11.3.2" \
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
# bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:11.2.3+maria~ubu2204
+ARG MARIADB_VERSION=1:11.3.2+maria~ubu2204
ENV MARIADB_VERSION $MARIADB_VERSION
# release-status:Stable
# release-support-type:Short Term Support
# (https://downloads.mariadb.org/rest-api/mariadb/)
# Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.2.3/repo/ubuntu/ jammy main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.3.2/repo/ubuntu/ jammy main main/debug"
RUN set -e;\
echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ Relevant Maintainers:
|
yosifkit
approved these changes
Feb 20, 2024
thanks @yosifkit |
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.
11.3.2 is stable
11.4.1 is RC