From d54e5431c5606536c5b3dd6f4912bbd5176ea345 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 28 Sep 2023 11:19:50 +0100 Subject: [PATCH] The `mariadb` containers are now jointly maintained by mariadb and docker Signed-off-by: Pedro Algarvio --- README.md | 12 ++++++------ containers.yml | 2 +- mirrors/mariadb/10.1.Dockerfile | 2 +- mirrors/mariadb/10.2.Dockerfile | 2 +- mirrors/mariadb/10.3.Dockerfile | 2 +- mirrors/mariadb/10.4.Dockerfile | 2 +- mirrors/mariadb/10.5.Dockerfile | 2 +- mirrors/mariadb/README.md | 12 ++++++------ mirrors/mariadb/latest.Dockerfile | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index b64a2d1..1a2120d 100644 --- a/README.md +++ b/README.md @@ -178,12 +178,12 @@ will be commited. ### [![MariaDB](https://github.com/saltstack/salt-ci-containers/actions/workflows/mariadb-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/mariadb-containers.yml) -- [mariadb/server:10.1](https://hub.docker.com/r/mariadb/server/tags?name=10.1) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.1` -- [mariadb/server:10.2](https://hub.docker.com/r/mariadb/server/tags?name=10.2) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.2` -- [mariadb/server:10.3](https://hub.docker.com/r/mariadb/server/tags?name=10.3) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.3` -- [mariadb/server:10.4](https://hub.docker.com/r/mariadb/server/tags?name=10.4) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.4` -- [mariadb/server:10.5](https://hub.docker.com/r/mariadb/server/tags?name=10.5) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.5` -- [mariadb/server:latest](https://hub.docker.com/r/mariadb/server/tags?name=latest) - `ghcr.io/saltstack/salt-ci-containers/mariadb:latest` +- [dockerhub/mariadb:10.1](https://hub.docker.com/r/_/mariadb/tags?name=10.1) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.1` +- [dockerhub/mariadb:10.2](https://hub.docker.com/r/_/mariadb/tags?name=10.2) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.2` +- [dockerhub/mariadb:10.3](https://hub.docker.com/r/_/mariadb/tags?name=10.3) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.3` +- [dockerhub/mariadb:10.4](https://hub.docker.com/r/_/mariadb/tags?name=10.4) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.4` +- [dockerhub/mariadb:10.5](https://hub.docker.com/r/_/mariadb/tags?name=10.5) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.5` +- [dockerhub/mariadb:latest](https://hub.docker.com/r/_/mariadb/tags?name=latest) - `ghcr.io/saltstack/salt-ci-containers/mariadb:latest` ### [![MySQL Server](https://github.com/saltstack/salt-ci-containers/actions/workflows/mysql-server-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/mysql-server-containers.yml) diff --git a/containers.yml b/containers.yml index 5937e66..b59cd2a 100644 --- a/containers.yml +++ b/containers.yml @@ -61,7 +61,7 @@ mirrors: - latest MariaDB: - container: mariadb/server + container: mariadb versions: - "10.1" - "10.2" diff --git a/mirrors/mariadb/10.1.Dockerfile b/mirrors/mariadb/10.1.Dockerfile index b3899d8..5e3690d 100644 --- a/mirrors/mariadb/10.1.Dockerfile +++ b/mirrors/mariadb/10.1.Dockerfile @@ -1 +1 @@ -FROM mariadb/server:10.1 +FROM mariadb:10.1 diff --git a/mirrors/mariadb/10.2.Dockerfile b/mirrors/mariadb/10.2.Dockerfile index af5addd..aa8d19c 100644 --- a/mirrors/mariadb/10.2.Dockerfile +++ b/mirrors/mariadb/10.2.Dockerfile @@ -1 +1 @@ -FROM mariadb/server:10.2 +FROM mariadb:10.2 diff --git a/mirrors/mariadb/10.3.Dockerfile b/mirrors/mariadb/10.3.Dockerfile index 9782b6d..0878072 100644 --- a/mirrors/mariadb/10.3.Dockerfile +++ b/mirrors/mariadb/10.3.Dockerfile @@ -1 +1 @@ -FROM mariadb/server:10.3 +FROM mariadb:10.3 diff --git a/mirrors/mariadb/10.4.Dockerfile b/mirrors/mariadb/10.4.Dockerfile index 53b0401..a786dea 100644 --- a/mirrors/mariadb/10.4.Dockerfile +++ b/mirrors/mariadb/10.4.Dockerfile @@ -1 +1 @@ -FROM mariadb/server:10.4 +FROM mariadb:10.4 diff --git a/mirrors/mariadb/10.5.Dockerfile b/mirrors/mariadb/10.5.Dockerfile index 8663861..787e7f0 100644 --- a/mirrors/mariadb/10.5.Dockerfile +++ b/mirrors/mariadb/10.5.Dockerfile @@ -1 +1 @@ -FROM mariadb/server:10.5 +FROM mariadb:10.5 diff --git a/mirrors/mariadb/README.md b/mirrors/mariadb/README.md index d86ab8a..def6162 100644 --- a/mirrors/mariadb/README.md +++ b/mirrors/mariadb/README.md @@ -1,8 +1,8 @@ # [![MariaDB](https://github.com/saltstack/salt-ci-containers/actions/workflows/mariadb-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/mariadb-containers.yml) -- [mariadb/server:10.1](https://hub.docker.com/r/mariadb/server/tags?name=10.1) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.1` -- [mariadb/server:10.2](https://hub.docker.com/r/mariadb/server/tags?name=10.2) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.2` -- [mariadb/server:10.3](https://hub.docker.com/r/mariadb/server/tags?name=10.3) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.3` -- [mariadb/server:10.4](https://hub.docker.com/r/mariadb/server/tags?name=10.4) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.4` -- [mariadb/server:10.5](https://hub.docker.com/r/mariadb/server/tags?name=10.5) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.5` -- [mariadb/server:latest](https://hub.docker.com/r/mariadb/server/tags?name=latest) - `ghcr.io/saltstack/salt-ci-containers/mariadb:latest` +- [dockerhub/mariadb:10.1](https://hub.docker.com/r/_/mariadb/tags?name=10.1) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.1` +- [dockerhub/mariadb:10.2](https://hub.docker.com/r/_/mariadb/tags?name=10.2) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.2` +- [dockerhub/mariadb:10.3](https://hub.docker.com/r/_/mariadb/tags?name=10.3) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.3` +- [dockerhub/mariadb:10.4](https://hub.docker.com/r/_/mariadb/tags?name=10.4) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.4` +- [dockerhub/mariadb:10.5](https://hub.docker.com/r/_/mariadb/tags?name=10.5) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.5` +- [dockerhub/mariadb:latest](https://hub.docker.com/r/_/mariadb/tags?name=latest) - `ghcr.io/saltstack/salt-ci-containers/mariadb:latest` diff --git a/mirrors/mariadb/latest.Dockerfile b/mirrors/mariadb/latest.Dockerfile index 6e59388..3775d47 100644 --- a/mirrors/mariadb/latest.Dockerfile +++ b/mirrors/mariadb/latest.Dockerfile @@ -1 +1 @@ -FROM mariadb/server:latest +FROM mariadb:latest