Skip to content

Commit

Permalink
Remove building Docker containers with MariaDB
Browse files Browse the repository at this point in the history
In vitessio#9518 MariaDB has been
deprecated, which means that at this point for the future Vitess v16 we
don't want to publish containers with MariaDB anymore.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
  • Loading branch information
dbussink committed Jan 4, 2023
1 parent 3e9e4ef commit 40a0d9a
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 314 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
# Please read docker/README.md to understand the different available images.

# This rule builds the bootstrap images for all flavors.
DOCKER_IMAGES_FOR_TEST = mariadb mariadb103 mysql57 mysql80 percona57 percona80
DOCKER_IMAGES_FOR_TEST = mysql57 mysql80 percona57 percona80
DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
BOOTSTRAP_VERSION=14
ensure_bootstrap_version:
Expand Down Expand Up @@ -323,7 +323,7 @@ endef
docker_base:
${call build_docker_image,docker/base/Dockerfile,vitess/base}

DOCKER_BASE_SUFFIX = mysql80 mariadb mariadb103 percona57 percona80
DOCKER_BASE_SUFFIX = mysql80 percona57 percona80
DOCKER_BASE_TARGETS = $(addprefix docker_base_, $(DOCKER_BASE_SUFFIX))
$(DOCKER_BASE_TARGETS): docker_base_%:
${call build_docker_image,docker/base/Dockerfile.$*,vitess/base:$*}
Expand All @@ -333,7 +333,7 @@ docker_base_all: docker_base $(DOCKER_BASE_TARGETS)
docker_lite:
${call build_docker_image,docker/lite/Dockerfile,vitess/lite}

DOCKER_LITE_SUFFIX = mysql57 ubi7.mysql57 mysql80 ubi7.mysql80 mariadb mariadb103 percona57 ubi7.percona57 percona80 ubi7.percona80 alpine testing ubi8.mysql80 ubi8.arm64.mysql80
DOCKER_LITE_SUFFIX = mysql57 ubi7.mysql57 mysql80 ubi7.mysql80 percona57 ubi7.percona57 percona80 ubi7.percona80 testing ubi8.mysql80 ubi8.arm64.mysql80
DOCKER_LITE_TARGETS = $(addprefix docker_lite_,$(DOCKER_LITE_SUFFIX))
$(DOCKER_LITE_TARGETS): docker_lite_%:
${call build_docker_image,docker/lite/Dockerfile.$*,vitess/lite:$*}
Expand All @@ -357,7 +357,7 @@ $(DOCKER_VTTESTSERVER_TARGETS): docker_vttestserver_%:
docker_vttestserver: $(DOCKER_VTTESTSERVER_TARGETS)
# This rule loads the working copy of the code into a bootstrap image,
# and then runs the tests inside Docker.
# Example: $ make docker_test flavor=mariadb
# Example: $ make docker_test flavor=mysql80
docker_test:
go run test.go -flavor $(flavor)

Expand Down
3 changes: 0 additions & 3 deletions doc/DockerBuild.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Then you can run our build script for the `lite` image which extracts the Vitess
vitess$ docker pull vitess/bootstrap:mysql56 # MySQL Community Edition 5.6
vitess$ docker pull vitess/bootstrap:percona57 # Percona Server 5.7
vitess$ docker pull vitess/bootstrap:percona # Percona Server
vitess$ docker pull vitess/bootstrap:mariadb # MariaDB
```

**Note:** If you have already downloaded the `vitess/bootstrap:<flavor>`
Expand All @@ -50,7 +49,6 @@ Then you can run our build script for the `lite` image which extracts the Vitess
vitess$ make docker_base_mysql56
vitess$ make docker_base_percona57
vitess$ make docker_base_percona
vitess$ make docker_base_mariadb
```

1. Build the `vitess/lite[:<flavor>]` image.
Expand All @@ -65,7 +63,6 @@ Then you can run our build script for the `lite` image which extracts the Vitess
vitess$ make docker_lite_mysql56
vitess$ make docker_lite_percona57
vitess$ make docker_lite_percona
vitess$ make docker_lite_mariadb
```

1. Re-tag the image under your personal repository, then upload it.
Expand Down
27 changes: 0 additions & 27 deletions docker/base/Dockerfile.mariadb

This file was deleted.

27 changes: 0 additions & 27 deletions docker/base/Dockerfile.mariadb103

This file was deleted.

30 changes: 0 additions & 30 deletions docker/bootstrap/Dockerfile.mariadb

This file was deleted.

19 changes: 0 additions & 19 deletions docker/bootstrap/Dockerfile.mariadb103

This file was deleted.

2 changes: 0 additions & 2 deletions docker/bootstrap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ after successfully running `bootstrap.sh` and `dev.env`.
The `vitess/bootstrap` image comes in different flavors:

* `vitess/bootstrap:common` - dependencies that are common to all flavors
* `vitess/bootstrap:mariadb` - bootstrap image for MariaDB 10.2
* `vitess/bootstrap:mariadb103`- bootstrap image for MariaDB 10.3
* `vitess/bootstrap:mysql57` - bootstrap image for MySQL 5.7
* `vitess/bootstrap:mysql80` - bootstrap image for MySQL 8.0
* `vitess/bootstrap:percona57` - bootstrap image for Percona Server 5.7
Expand Down
58 changes: 0 additions & 58 deletions docker/lite/Dockerfile.alpine

This file was deleted.

58 changes: 0 additions & 58 deletions docker/lite/Dockerfile.mariadb

This file was deleted.

58 changes: 0 additions & 58 deletions docker/lite/Dockerfile.mariadb103

This file was deleted.

Loading

0 comments on commit 40a0d9a

Please sign in to comment.