Skip to content
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 releases 20210623 #10414

Merged
merged 1 commit into from
Jun 23, 2021

Conversation

dbart
Copy link
Contributor

@dbart dbart commented Jun 23, 2021

Hi,

We've done our 10.5.11, 10.4.20, 10.3.30, and 10.2.39 maintenance releases.

@github-actions
Copy link

Diff for 93ce214:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index fc948a4..f82c441 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,27 +1,27 @@
 Maintainers: Daniel Black <daniel@mariadb.org> (@grooverdan), Daniel Bartholomew <dbart@mariadb.com> (@dbart)
 GitRepo: https://github.com/MariaDB/mariadb-docker.git
 
-Tags: 10.2.38-bionic, 10.2-bionic, 10.2.38, 10.2
+Tags: 10.2.39-bionic, 10.2-bionic, 10.2.39, 10.2
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 710e0cd9d9197becc954e9a4c572cb97dd1d07a8
+GitCommit: 0c4bdac53d22647f39187e8d00d02c5a2e760940
 Directory: 10.2
 
-Tags: 10.3.29-focal, 10.3-focal, 10.3.29, 10.3
+Tags: 10.3.30-focal, 10.3-focal, 10.3.30, 10.3
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 710e0cd9d9197becc954e9a4c572cb97dd1d07a8
+GitCommit: 254bc8c6646f75d335325c064905d7288ca24aca
 Directory: 10.3
 
-Tags: 10.4.19-focal, 10.4-focal, 10.4.19, 10.4
+Tags: 10.4.20-focal, 10.4-focal, 10.4.20, 10.4
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 710e0cd9d9197becc954e9a4c572cb97dd1d07a8
+GitCommit: 684d352c819d94e9b914e056655180e2be394819
 Directory: 10.4
 
-Tags: 10.5.10-focal, 10.5-focal, 10-focal, focal, 10.5.10, 10.5, 10, latest
+Tags: 10.5.11-focal, 10.5-focal, 10-focal, focal, 10.5.11, 10.5, 10, latest
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 710e0cd9d9197becc954e9a4c572cb97dd1d07a8
+GitCommit: 6c466f9551cf73bbaebd02c8f68b058c4e44a40c
 Directory: 10.5
 
 Tags: 10.6.2-focal, 10.6-focal, rc-focal, 10.6.2, 10.6, rc
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 1d9b652b4ce1e36f39abd8d302d4908617447d77
+GitCommit: 465e597bfa3bd769b5f528df17426bec0724ab12
 Directory: 10.6
diff --git a/_bashbrew-list b/_bashbrew-list
index 07e0f9c..dae1c4a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,20 +2,20 @@ mariadb:10
 mariadb:10-focal
 mariadb:10.2
 mariadb:10.2-bionic
-mariadb:10.2.38
-mariadb:10.2.38-bionic
+mariadb:10.2.39
+mariadb:10.2.39-bionic
 mariadb:10.3
 mariadb:10.3-focal
-mariadb:10.3.29
-mariadb:10.3.29-focal
+mariadb:10.3.30
+mariadb:10.3.30-focal
 mariadb:10.4
 mariadb:10.4-focal
-mariadb:10.4.19
-mariadb:10.4.19-focal
+mariadb:10.4.20
+mariadb:10.4.20-focal
 mariadb:10.5
 mariadb:10.5-focal
-mariadb:10.5.10
-mariadb:10.5.10-focal
+mariadb:10.5.11
+mariadb:10.5.11-focal
 mariadb:10.6
 mariadb:10.6-focal
 mariadb:10.6.2
diff --git a/mariadb_10.2/Dockerfile b/mariadb_10.2/Dockerfile
index d779512..8239c19 100644
--- a/mariadb_10.2/Dockerfile
+++ b/mariadb_10.2/Dockerfile
@@ -68,7 +68,7 @@ ENV GPG_KEYS \
 RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
 	gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \
 	command -v gpgconf > /dev/null && gpgconf --kill all || :; \
@@ -77,7 +77,7 @@ RUN set -ex; \
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le
 ENV MARIADB_MAJOR 10.2
-ENV MARIADB_VERSION 1:10.2.38+maria~bionic
+ENV MARIADB_VERSION 1:10.2.39+maria~bionic
 # release-status:Stable
 # (https://downloads.mariadb.org/mariadb/+releases/)
 
diff --git a/mariadb_10.3/Dockerfile b/mariadb_10.3/Dockerfile
index afb1b9f..6aa9c0d 100644
--- a/mariadb_10.3/Dockerfile
+++ b/mariadb_10.3/Dockerfile
@@ -68,7 +68,7 @@ ENV GPG_KEYS \
 RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
 	gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \
 	command -v gpgconf > /dev/null && gpgconf --kill all || :; \
@@ -77,7 +77,7 @@ RUN set -ex; \
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le
 ENV MARIADB_MAJOR 10.3
-ENV MARIADB_VERSION 1:10.3.29+maria~focal
+ENV MARIADB_VERSION 1:10.3.30+maria~focal
 # release-status:Stable
 # (https://downloads.mariadb.org/mariadb/+releases/)
 
diff --git a/mariadb_10.4/Dockerfile b/mariadb_10.4/Dockerfile
index 7aa6c41..265a0dc 100644
--- a/mariadb_10.4/Dockerfile
+++ b/mariadb_10.4/Dockerfile
@@ -68,7 +68,7 @@ ENV GPG_KEYS \
 RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
 	gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \
 	command -v gpgconf > /dev/null && gpgconf --kill all || :; \
@@ -77,7 +77,7 @@ RUN set -ex; \
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le
 ENV MARIADB_MAJOR 10.4
-ENV MARIADB_VERSION 1:10.4.19+maria~focal
+ENV MARIADB_VERSION 1:10.4.20+maria~focal
 # release-status:Stable
 # (https://downloads.mariadb.org/mariadb/+releases/)
 
diff --git a/mariadb_latest/Dockerfile b/mariadb_latest/Dockerfile
index a08e99d..4b01536 100644
--- a/mariadb_latest/Dockerfile
+++ b/mariadb_latest/Dockerfile
@@ -68,7 +68,7 @@ ENV GPG_KEYS \
 RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
 	gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \
 	command -v gpgconf > /dev/null && gpgconf --kill all || :; \
@@ -77,7 +77,7 @@ RUN set -ex; \
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le
 ENV MARIADB_MAJOR 10.5
-ENV MARIADB_VERSION 1:10.5.10+maria~focal
+ENV MARIADB_VERSION 1:10.5.11+maria~focal
 # release-status:Stable
 # (https://downloads.mariadb.org/mariadb/+releases/)
 
diff --git a/mariadb_rc/Dockerfile b/mariadb_rc/Dockerfile
index afb19f1..9e676e0 100644
--- a/mariadb_rc/Dockerfile
+++ b/mariadb_rc/Dockerfile
@@ -68,7 +68,7 @@ ENV GPG_KEYS \
 RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
 	gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \
 	command -v gpgconf > /dev/null && gpgconf --kill all || :; \

@yosifkit yosifkit merged commit 34a3e0f into docker-library:master Jun 23, 2021
@grooverdan
Copy link
Contributor

@yosifkit as noted MariaDB/mariadb-docker#381 this has only pushed arm64 into the manifest for the latest release:

http://soaphub.org/imagehub/?q=mariadb&n=library&p=1

I've checked the mirrors and the packages are there now, https://ftp.osuosl.org/pub/mariadb/repo/10.4/ubuntu/pool/main/m/mariadb-10.4/, though maybe there weren't at merge time.

Any chance of retriggering this release?

@yosifkit
Copy link
Member

It was likely the build queue being full (because of the merge of Debian in #10402).

More architectures are showing now:

$ docker manifest inspect mariadb
{
   "schemaVersion": 2,
   "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
   "manifests": [
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 2412,
         "digest": "sha256:fad4e97cf0668e587347150d8e9493c495017ed345e8471e120d15b6739dbb2e",
         "platform": {
            "architecture": "amd64",
            "os": "linux"
         }
      },
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 2412,
         "digest": "sha256:54b51624f0f714e43cc58f982b525f3a8088b0f4da13b800b3c47a078806da2c",
         "platform": {
            "architecture": "arm64",
            "os": "linux",
            "variant": "v8"
         }
      },
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 2412,
         "digest": "sha256:7486c3648f7981d487c319e9f2b49e67c2afc3ac328cf02f883afa530140b7ca",
         "platform": {
            "architecture": "ppc64le",
            "os": "linux"
         }
      }
   ]
}

@grooverdan
Copy link
Contributor

Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants