From 5f2d2ceafd52aa55a76f2f0acafb6b07fb9c4d09 Mon Sep 17 00:00:00 2001
From: Stas Maksimov <smaksimov@slack-corp.com>
Date: Wed, 22 Nov 2023 16:58:03 +0000
Subject: [PATCH] revert bootstrap version back to 10.2

---
 Makefile                          | 2 +-
 docker/base/Dockerfile.mariadb    | 2 +-
 docker/base/Dockerfile.mariadb103 | 2 +-
 docker/base/Dockerfile.mysql80    | 2 +-
 docker/base/Dockerfile.percona57  | 2 +-
 docker/base/Dockerfile.percona80  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index cedc7a9d31e..f75e3a0721c 100644
--- a/Makefile
+++ b/Makefile
@@ -243,7 +243,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
 # This rule builds the bootstrap images for all flavors.
 DOCKER_IMAGES_FOR_TEST = mariadb mariadb103 mysql57 mysql80 percona57 percona80
 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
-BOOTSTRAP_VERSION=19
+BOOTSTRAP_VERSION=10.2
 ensure_bootstrap_version:
 	find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \;
 	sed -i 's/\(^.*flag.String(\"bootstrap-version\",\) *\"[^\"]\+\"/\1 \"${BOOTSTRAP_VERSION}\"/' test.go
diff --git a/docker/base/Dockerfile.mariadb b/docker/base/Dockerfile.mariadb
index b73e941e376..eb1f8bdfa7a 100644
--- a/docker/base/Dockerfile.mariadb
+++ b/docker/base/Dockerfile.mariadb
@@ -1,4 +1,4 @@
-ARG bootstrap_version=19
+ARG bootstrap_version=10.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb"
 
 FROM "${image}"
diff --git a/docker/base/Dockerfile.mariadb103 b/docker/base/Dockerfile.mariadb103
index ae9c2eb0a4d..1779167c237 100644
--- a/docker/base/Dockerfile.mariadb103
+++ b/docker/base/Dockerfile.mariadb103
@@ -1,4 +1,4 @@
-ARG bootstrap_version=19
+ARG bootstrap_version=10.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103"
 
 FROM "${image}"
diff --git a/docker/base/Dockerfile.mysql80 b/docker/base/Dockerfile.mysql80
index e12c5cb3f92..3aa689769fc 100644
--- a/docker/base/Dockerfile.mysql80
+++ b/docker/base/Dockerfile.mysql80
@@ -1,4 +1,4 @@
-ARG bootstrap_version=19
+ARG bootstrap_version=10.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"
 
 FROM "${image}"
diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57
index e30e0172d93..e3fb8bedc95 100644
--- a/docker/base/Dockerfile.percona57
+++ b/docker/base/Dockerfile.percona57
@@ -1,4 +1,4 @@
-ARG bootstrap_version=19
+ARG bootstrap_version=10.2
 ARG image="vitess/bootstrap:${bootstrap_version}-percona57"
 
 FROM "${image}"
diff --git a/docker/base/Dockerfile.percona80 b/docker/base/Dockerfile.percona80
index cfc93d3a579..c7ae3ed7ac2 100644
--- a/docker/base/Dockerfile.percona80
+++ b/docker/base/Dockerfile.percona80
@@ -1,4 +1,4 @@
-ARG bootstrap_version=19
+ARG bootstrap_version=10.2
 ARG image="vitess/bootstrap:${bootstrap_version}-percona80"
 
 FROM "${image}"