From 38879cf90dfcf5af18657315e7296f034eb19b96 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Tue, 20 Aug 2024 11:49:49 -0600
Subject: [PATCH] Remove mysql57/percona57 bootstrap images

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 Makefile                              |  2 +-
 docker/bootstrap/CHANGELOG.md         |  3 ++-
 docker/bootstrap/Dockerfile.mysql57   | 24 ------------------------
 docker/bootstrap/Dockerfile.percona57 | 21 ---------------------
 docker/bootstrap/README.md            |  2 --
 test.go                               |  2 +-
 6 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 docker/bootstrap/Dockerfile.mysql57
 delete mode 100644 docker/bootstrap/Dockerfile.percona57

diff --git a/Makefile b/Makefile
index 219139af796..997eec5db12 100644
--- a/Makefile
+++ b/Makefile
@@ -284,7 +284,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 = mysql57 mysql80 percona57 percona80
+DOCKER_IMAGES_FOR_TEST = mysql80 percona80
 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
 BOOTSTRAP_VERSION=35
 ensure_bootstrap_version:
diff --git a/docker/bootstrap/CHANGELOG.md b/docker/bootstrap/CHANGELOG.md
index ee400664a8b..0ecd5ede02f 100644
--- a/docker/bootstrap/CHANGELOG.md
+++ b/docker/bootstrap/CHANGELOG.md
@@ -136,4 +136,5 @@ List of changes between bootstrap image versions.
 
 ## [35] - 2024-08-14
 ### Changes
-- Update build to golang 1.23.0
\ No newline at end of file
+- Update build to golang 1.23.0
+- MySQL57 and Percona57 tags will be removed thereafter
\ No newline at end of file
diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57
deleted file mode 100644
index b840a7b8153..00000000000
--- a/docker/bootstrap/Dockerfile.mysql57
+++ /dev/null
@@ -1,24 +0,0 @@
-ARG bootstrap_version
-ARG image="vitess/bootstrap:${bootstrap_version}-common"
-
-FROM --platform=linux/amd64 "${image}"
-
-USER root
-
-# Install MySQL 5.7
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg dirmngr ca-certificates && \
-    for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com A8D3785C && break; done && \
-    add-apt-repository 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' && \
-    for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \
-    echo 'deb http://repo.percona.com/apt buster main' > /etc/apt/sources.list.d/percona.list && \
-    { \
-        echo debconf debconf/frontend select Noninteractive; \
-        echo percona-server-server-5.7 percona-server-server/root_password password 'unused'; \
-        echo percona-server-server-5.7 percona-server-server/root_password_again password 'unused'; \
-    } | debconf-set-selections && \
-    apt-get update -y && apt-get install -y percona-release && \
-    percona-release enable-only tools && apt-get update -y && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \
-    rm -rf /var/lib/apt/lists/*
-
-USER vitess
diff --git a/docker/bootstrap/Dockerfile.percona57 b/docker/bootstrap/Dockerfile.percona57
deleted file mode 100644
index 28a1cd3cb18..00000000000
--- a/docker/bootstrap/Dockerfile.percona57
+++ /dev/null
@@ -1,21 +0,0 @@
-ARG bootstrap_version
-ARG image="vitess/bootstrap:${bootstrap_version}-common"
-
-FROM --platform=linux/amd64 "${image}"
-
-USER root
-
-# Install Percona 5.7
-RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \
-    add-apt-repository 'deb http://repo.percona.com/apt bullseye main' && \
-    { \
-        echo debconf debconf/frontend select Noninteractive; \
-        echo percona-server-server-5.7 percona-server-server/root_password password 'unused'; \
-        echo percona-server-server-5.7 percona-server-server/root_password_again password 'unused'; \
-    } | debconf-set-selections && \
-    apt-get update -y && \
-    apt-get install -y --no-install-recommends percona-server-server-5.7 && \
-    apt-get install -y --no-install-recommends libperconaserverclient20-dev percona-xtrabackup-24 && \
-    rm -rf /var/lib/apt/lists/*
-
-USER vitess
diff --git a/docker/bootstrap/README.md b/docker/bootstrap/README.md
index 717f4336442..b273305d6b9 100644
--- a/docker/bootstrap/README.md
+++ b/docker/bootstrap/README.md
@@ -6,9 +6,7 @@ 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: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
 * `vitess/bootstrap:percona80` - bootstrap image for Percona Server 8.0
 
 **NOTE: Unlike the base image that builds Vitess itself, this bootstrap image
diff --git a/test.go b/test.go
index 448dd33d0f9..30764662d33 100755
--- a/test.go
+++ b/test.go
@@ -112,7 +112,7 @@ const (
 	configFileName = "test/config.json"
 
 	// List of flavors for which a bootstrap Docker image is available.
-	flavors = "mysql57,mysql80,percona,percona57,percona80"
+	flavors = "mysql80,percona80"
 )
 
 // Config is the overall object serialized in test/config.json.