From 98611efacaef04f674246b9803001830f706bbc4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Sep 2023 17:38:11 +0100 Subject: [PATCH] Remove some of the MariaDB containers as it breaks all test runs in Salt Signed-off-by: Pedro Algarvio --- README.md | 2 -- containers.yml | 2 -- mirrors/mariadb/10.6.Dockerfile | 1 - mirrors/mariadb/11.1.Dockerfile | 1 - mirrors/mariadb/README.md | 2 -- 5 files changed, 8 deletions(-) delete mode 100644 mirrors/mariadb/10.6.Dockerfile delete mode 100644 mirrors/mariadb/11.1.Dockerfile diff --git a/README.md b/README.md index 4d58f26..b64a2d1 100644 --- a/README.md +++ b/README.md @@ -183,8 +183,6 @@ will be commited. - [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:10.6](https://hub.docker.com/r/mariadb/server/tags?name=10.6) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.6` -- [mariadb/server:11.1](https://hub.docker.com/r/mariadb/server/tags?name=11.1) - `ghcr.io/saltstack/salt-ci-containers/mariadb:11.1` - [mariadb/server:latest](https://hub.docker.com/r/mariadb/server/tags?name=latest) - `ghcr.io/saltstack/salt-ci-containers/mariadb:latest` diff --git a/containers.yml b/containers.yml index e00745d..10ff693 100644 --- a/containers.yml +++ b/containers.yml @@ -69,8 +69,6 @@ mirrors: - "10.3" - "10.4" - "10.5" - - "10.6" - - "11.1" - latest Percona: diff --git a/mirrors/mariadb/10.6.Dockerfile b/mirrors/mariadb/10.6.Dockerfile deleted file mode 100644 index 13b11d4..0000000 --- a/mirrors/mariadb/10.6.Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM mariadb/server:10.6 diff --git a/mirrors/mariadb/11.1.Dockerfile b/mirrors/mariadb/11.1.Dockerfile deleted file mode 100644 index ea236a7..0000000 --- a/mirrors/mariadb/11.1.Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM mariadb/server:11.1 diff --git a/mirrors/mariadb/README.md b/mirrors/mariadb/README.md index 3957947..d86ab8a 100644 --- a/mirrors/mariadb/README.md +++ b/mirrors/mariadb/README.md @@ -5,6 +5,4 @@ - [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:10.6](https://hub.docker.com/r/mariadb/server/tags?name=10.6) - `ghcr.io/saltstack/salt-ci-containers/mariadb:10.6` -- [mariadb/server:11.1](https://hub.docker.com/r/mariadb/server/tags?name=11.1) - `ghcr.io/saltstack/salt-ci-containers/mariadb:11.1` - [mariadb/server:latest](https://hub.docker.com/r/mariadb/server/tags?name=latest) - `ghcr.io/saltstack/salt-ci-containers/mariadb:latest`