From d164d36fef03f2a98c2a5c7534747e639520b661 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Fri, 28 Jul 2023 15:00:11 +0200 Subject: [PATCH 01/53] bump docker images to bullseye Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.common | 2 +- docker/bootstrap/Dockerfile.mysql57 | 6 +++--- docker/bootstrap/Dockerfile.mysql80 | 4 ++-- docker/bootstrap/Dockerfile.percona57 | 2 +- docker/bootstrap/Dockerfile.percona80 | 4 ++-- docker/lite/Dockerfile.mysql57 | 2 +- docker/lite/Dockerfile.mysql80 | 2 +- docker/lite/Dockerfile.percona57 | 2 +- docker/lite/Dockerfile.percona80 | 2 +- docker/lite/Dockerfile.testing | 2 +- docker/lite/install_dependencies.sh | 10 +++++----- docker/vttestserver/Dockerfile.mysql57 | 2 +- docker/vttestserver/Dockerfile.mysql80 | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docker/bootstrap/Dockerfile.common b/docker/bootstrap/Dockerfile.common index 3f8e7d68a59..46c1175415c 100644 --- a/docker/bootstrap/Dockerfile.common +++ b/docker/bootstrap/Dockerfile.common @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 golang:1.20.5-buster +FROM --platform=linux/amd64 golang:1.20.6-bullseye # Install Vitess build dependencies RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 4e9b335ddac..47bc48c428e 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -6,16 +6,16 @@ FROM --platform=linux/amd64 "${image}" # 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 467B942D3A79BD29 && break; done && \ - add-apt-repository 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' && \ + add-apt-repository 'deb http://repo.mysql.com/apt/debian/ bullseye 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 'deb http://repo.percona.com/apt bullseye 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 && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y percona-server-5.7 libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ rm -rf /var/lib/apt/lists/* # Bootstrap Vitess diff --git a/docker/bootstrap/Dockerfile.mysql80 b/docker/bootstrap/Dockerfile.mysql80 index e064c638d99..059f01b8101 100644 --- a/docker/bootstrap/Dockerfile.mysql80 +++ b/docker/bootstrap/Dockerfile.mysql80 @@ -6,9 +6,9 @@ FROM --platform=linux/amd64 "${image}" # Install MySQL 8.0 RUN for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 8C718D3B5072E1F5 && break; done && \ for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 467B942D3A79BD29 && break; done && \ - add-apt-repository 'deb http://repo.mysql.com/apt/debian/ buster mysql-8.0' && \ + add-apt-repository 'deb http://repo.mysql.com/apt/debian/ bullseye mysql-8.0' && \ 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 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list && \ { \ echo debconf debconf/frontend select Noninteractive; \ echo percona-server-server-8.0 percona-server-server/root_password password 'unused'; \ diff --git a/docker/bootstrap/Dockerfile.percona57 b/docker/bootstrap/Dockerfile.percona57 index 2d8beb5e95d..a9378fbdb94 100644 --- a/docker/bootstrap/Dockerfile.percona57 +++ b/docker/bootstrap/Dockerfile.percona57 @@ -5,7 +5,7 @@ FROM --platform=linux/amd64 "${image}" # 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 buster main' && \ + 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'; \ diff --git a/docker/bootstrap/Dockerfile.percona80 b/docker/bootstrap/Dockerfile.percona80 index 5dadc32cd0a..446ec554612 100644 --- a/docker/bootstrap/Dockerfile.percona80 +++ b/docker/bootstrap/Dockerfile.percona80 @@ -5,7 +5,7 @@ FROM --platform=linux/amd64 "${image}" # Install Percona 8.0 RUN 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/ps-80/apt buster main' > /etc/apt/sources.list.d/percona.list && \ + && echo 'deb http://repo.percona.com/ps-80/apt bullseye main' > /etc/apt/sources.list.d/percona.list && \ { \ echo debconf debconf/frontend select Noninteractive; \ echo percona-server-server-8.0 percona-server-server/root_password password 'unused'; \ @@ -21,7 +21,7 @@ RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.c rsync \ libev4 \ # && rm -f /etc/apt/sources.list.d/percona.list \ - && echo 'deb http://repo.percona.com/apt buster main' > /etc/apt/sources.list.d/percona.list \ + && echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list \ # { \ # echo debconf debconf/frontend select Noninteractive; \ # echo percona-server-server-8.0 percona-server-server/root_password password 'unused'; \ diff --git a/docker/lite/Dockerfile.mysql57 b/docker/lite/Dockerfile.mysql57 index 960427e2504..a6dbd6476e1 100644 --- a/docker/lite/Dockerfile.mysql57 +++ b/docker/lite/Dockerfile.mysql57 @@ -33,7 +33,7 @@ USER vitess RUN make install PREFIX=/vt/install # Start over and build the final image. -FROM debian:buster-slim +FROM debian:bullseye-slim # Install dependencies COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh diff --git a/docker/lite/Dockerfile.mysql80 b/docker/lite/Dockerfile.mysql80 index 25d717e73eb..a7717140ca9 100644 --- a/docker/lite/Dockerfile.mysql80 +++ b/docker/lite/Dockerfile.mysql80 @@ -33,7 +33,7 @@ USER vitess RUN make install PREFIX=/vt/install # Start over and build the final image. -FROM debian:buster-slim +FROM debian:bullseye-slim # Install dependencies COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh diff --git a/docker/lite/Dockerfile.percona57 b/docker/lite/Dockerfile.percona57 index 773c6ed9462..2bab8ce4c60 100644 --- a/docker/lite/Dockerfile.percona57 +++ b/docker/lite/Dockerfile.percona57 @@ -33,7 +33,7 @@ USER vitess RUN make install PREFIX=/vt/install # Start over and build the final image. -FROM debian:buster-slim +FROM debian:bullseye-slim # Install dependencies COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh diff --git a/docker/lite/Dockerfile.percona80 b/docker/lite/Dockerfile.percona80 index 49287230ca2..0827a44963f 100644 --- a/docker/lite/Dockerfile.percona80 +++ b/docker/lite/Dockerfile.percona80 @@ -33,7 +33,7 @@ USER vitess RUN make install PREFIX=/vt/install # Start over and build the final image. -FROM debian:buster-slim +FROM debian:bullseye-slim # Install dependencies COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh diff --git a/docker/lite/Dockerfile.testing b/docker/lite/Dockerfile.testing index 412d62300e5..a9846512492 100644 --- a/docker/lite/Dockerfile.testing +++ b/docker/lite/Dockerfile.testing @@ -33,7 +33,7 @@ USER vitess RUN make install-testing PREFIX=/vt/install # Start over and build the final image. -FROM debian:buster-slim +FROM debian:bullseye-slim # Install dependencies COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index b4526a274d4..c9b19107d7c 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -145,21 +145,21 @@ add_apt_key 9334A25F8507EFA5 # Add extra apt repositories for MySQL. case "${FLAVOR}" in mysql57) - echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list + echo 'deb http://repo.mysql.com/apt/debian/ bullseye mysql-5.7' > /etc/apt/sources.list.d/mysql.list ;; mysql80) - echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-8.0' > /etc/apt/sources.list.d/mysql.list + echo 'deb http://repo.mysql.com/apt/debian/ bullseye mysql-8.0' > /etc/apt/sources.list.d/mysql.list ;; esac # Add extra apt repositories for Percona Server and/or Percona XtraBackup. case "${FLAVOR}" in mysql57|mysql80|percona57) - echo 'deb http://repo.percona.com/apt buster main' > /etc/apt/sources.list.d/percona.list + echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list ;; percona80) - echo 'deb http://repo.percona.com/apt buster main' > /etc/apt/sources.list.d/percona.list - echo 'deb http://repo.percona.com/ps-80/apt buster main' > /etc/apt/sources.list.d/percona80.list + echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list + echo 'deb http://repo.percona.com/ps-80/apt bullseye main' > /etc/apt/sources.list.d/percona80.list ;; esac diff --git a/docker/vttestserver/Dockerfile.mysql57 b/docker/vttestserver/Dockerfile.mysql57 index 539dfedd61b..c5b2da1f2b3 100644 --- a/docker/vttestserver/Dockerfile.mysql57 +++ b/docker/vttestserver/Dockerfile.mysql57 @@ -33,7 +33,7 @@ USER vitess RUN make install-testing PREFIX=/vt/install # Start over and build the final image. -FROM debian:buster-slim +FROM debian:bullseye-slim # Install dependencies COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh diff --git a/docker/vttestserver/Dockerfile.mysql80 b/docker/vttestserver/Dockerfile.mysql80 index caa61f93dff..bbb63c99541 100644 --- a/docker/vttestserver/Dockerfile.mysql80 +++ b/docker/vttestserver/Dockerfile.mysql80 @@ -33,7 +33,7 @@ USER vitess RUN make install-testing PREFIX=/vt/install # Start over and build the final image. -FROM debian:buster-slim +FROM debian:bullseye-slim # Install dependencies COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh From 6c55af524da9a34f59a47e97e24abd85832acea6 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Fri, 28 Jul 2023 17:26:45 +0200 Subject: [PATCH 02/53] use default-mysql-server to install mysql Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 47bc48c428e..edb6b1df853 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -15,7 +15,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins echo percona-server-server-5.7 percona-server-server/root_password_again password 'unused'; \ } | debconf-set-selections && \ apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y percona-server-5.7 libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y default-mysql-server libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ rm -rf /var/lib/apt/lists/* # Bootstrap Vitess From e16a187483c34742b20da34d635373985b9c00dd Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Fri, 28 Jul 2023 17:32:56 +0200 Subject: [PATCH 03/53] revert back to percona Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index edb6b1df853..47bc48c428e 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -15,7 +15,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins echo percona-server-server-5.7 percona-server-server/root_password_again password 'unused'; \ } | debconf-set-selections && \ apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y default-mysql-server libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y percona-server-5.7 libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ rm -rf /var/lib/apt/lists/* # Bootstrap Vitess From df9b7304fec2ea91f06628a16ac05946db9a105d Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Fri, 28 Jul 2023 17:38:00 +0200 Subject: [PATCH 04/53] use server-server Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 47bc48c428e..4f48f25a07b 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -15,7 +15,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins echo percona-server-server-5.7 percona-server-server/root_password_again password 'unused'; \ } | debconf-set-selections && \ apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y percona-server-5.7 libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y percona-server-server-5.7 libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ rm -rf /var/lib/apt/lists/* # Bootstrap Vitess From b486a49e7ddf1d98a8f7fdc5df9295741eaac9b4 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Fri, 28 Jul 2023 18:08:21 +0200 Subject: [PATCH 05/53] install mysql57 in a separate apt call Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 4f48f25a07b..2e972b039cd 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -6,7 +6,6 @@ FROM --platform=linux/amd64 "${image}" # 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 467B942D3A79BD29 && break; done && \ - add-apt-repository 'deb http://repo.mysql.com/apt/debian/ bullseye 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 bullseye main' > /etc/apt/sources.list.d/percona.list && \ { \ @@ -15,7 +14,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins echo percona-server-server-5.7 percona-server-server/root_password_again password 'unused'; \ } | debconf-set-selections && \ apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y percona-server-server-5.7 libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y percona-server-server-5.7 && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ rm -rf /var/lib/apt/lists/* # Bootstrap Vitess From eaaabcd7d0385df8eff1813d1abd7781b1eb8f8e Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Fri, 28 Jul 2023 18:19:10 +0200 Subject: [PATCH 06/53] get mysql57 from mysql apt repo Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 2e972b039cd..c77eb20e482 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -6,6 +6,7 @@ FROM --platform=linux/amd64 "${image}" # 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 467B942D3A79BD29 && 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 bullseye main' > /etc/apt/sources.list.d/percona.list && \ { \ @@ -14,7 +15,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins echo percona-server-server-5.7 percona-server-server/root_password_again password 'unused'; \ } | debconf-set-selections && \ apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y percona-server-server-5.7 && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y default-mysql-server && \ DEBIAN_FRONTEND=noninteractive apt-get install -y libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ rm -rf /var/lib/apt/lists/* From ecfa2e24ac402302f155291cd453072a203a433e Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Fri, 28 Jul 2023 18:26:53 +0200 Subject: [PATCH 07/53] update percona-57 dockerfile to run the apt-get install step in two steps Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.percona57 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/bootstrap/Dockerfile.percona57 b/docker/bootstrap/Dockerfile.percona57 index a9378fbdb94..febe09fd8bf 100644 --- a/docker/bootstrap/Dockerfile.percona57 +++ b/docker/bootstrap/Dockerfile.percona57 @@ -12,9 +12,8 @@ RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.c echo percona-server-server-5.7 percona-server-server/root_password_again password 'unused'; \ } | debconf-set-selections && \ apt-get update && \ - apt-get install -y --no-install-recommends \ - percona-server-server-5.7 \ - libperconaserverclient20-dev percona-xtrabackup-24 && \ + 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/* # Bootstrap Vitess From 685b391e85cdf8b95912ddaff8ec335173067f3f Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 31 Jul 2023 18:27:21 +0200 Subject: [PATCH 08/53] push to frouioui repository for test purposes Signed-off-by: Florent Poinsard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 37eda5fcbe6..e929cc2fa75 100644 --- a/Makefile +++ b/Makefile @@ -285,7 +285,7 @@ docker_bootstrap_test: flavors='$(DOCKER_IMAGES_FOR_TEST)' && ./test.go -pull=false -parallel=2 -bootstrap-version=${BOOTSTRAP_VERSION} -flavor=$${flavors// /,} docker_bootstrap_push: - for i in $(DOCKER_IMAGES); do echo "pushing bootstrap image: ${BOOTSTRAP_VERSION}-$$i"; docker push vitess/bootstrap:${BOOTSTRAP_VERSION}-$$i || exit 1; done + for i in $(DOCKER_IMAGES); do echo "pushing bootstrap image: ${BOOTSTRAP_VERSION}-$$i"; docker push vitess/bootstrap:${BOOTSTRAP_VERSION}-$$i frouioui/bootstrap:${BOOTSTRAP_VERSION}-$$i || exit 1; done # Use this target to update the local copy of your images with the one on Dockerhub. docker_bootstrap_pull: From 20292a63d4666f94aeba9148c662bc29f2e52ccb Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 31 Jul 2023 18:35:14 +0200 Subject: [PATCH 09/53] [debug] build and push on frouioui user Signed-off-by: Florent Poinsard --- Makefile | 2 +- docker/bootstrap/build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e929cc2fa75..e74c17345e9 100644 --- a/Makefile +++ b/Makefile @@ -285,7 +285,7 @@ docker_bootstrap_test: flavors='$(DOCKER_IMAGES_FOR_TEST)' && ./test.go -pull=false -parallel=2 -bootstrap-version=${BOOTSTRAP_VERSION} -flavor=$${flavors// /,} docker_bootstrap_push: - for i in $(DOCKER_IMAGES); do echo "pushing bootstrap image: ${BOOTSTRAP_VERSION}-$$i"; docker push vitess/bootstrap:${BOOTSTRAP_VERSION}-$$i frouioui/bootstrap:${BOOTSTRAP_VERSION}-$$i || exit 1; done + for i in $(DOCKER_IMAGES); do echo "pushing bootstrap image: ${BOOTSTRAP_VERSION}-$$i"; docker push frouioui/bootstrap:${BOOTSTRAP_VERSION}-$$i || exit 1; done # Use this target to update the local copy of your images with the one on Dockerhub. docker_bootstrap_pull: diff --git a/docker/bootstrap/build.sh b/docker/bootstrap/build.sh index 8cc6a151606..9a2acce8485 100755 --- a/docker/bootstrap/build.sh +++ b/docker/bootstrap/build.sh @@ -48,8 +48,8 @@ chmod -R o=rx *; arch=$(uname -m) -base_image="${base_image:-vitess/bootstrap:$version-common}" -image="${image:-vitess/bootstrap:$version-$flavor}" +base_image="${base_image:-frouioui/bootstrap:$version-common}" +image="${image:-frouioui/bootstrap:$version-$flavor}" while [ $# -gt 0 ]; do if [[ $1 == *"--"* ]]; then From 87817b01e8c967c28bbd4718ca7ae2cae988ec8c Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 31 Jul 2023 18:46:15 +0200 Subject: [PATCH 10/53] [debug] build lite image on frouioui user Signed-off-by: Florent Poinsard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e74c17345e9..f4de8dcef46 100644 --- a/Makefile +++ b/Makefile @@ -320,7 +320,7 @@ $(DOCKER_BASE_TARGETS): docker_base_%: docker_base_all: docker_base $(DOCKER_BASE_TARGETS) docker_lite: - ${call build_docker_image,docker/lite/Dockerfile,vitess/lite} + ${call build_docker_image,docker/lite/Dockerfile,frouioui/lite} 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)) From ee1cd706ac3dc9dacd74cb3c72dc05487708d2d6 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 31 Jul 2023 19:05:57 +0200 Subject: [PATCH 11/53] use bullseye for the mysql repo on bootstrap 57 builds Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index c77eb20e482..b69ed566cb9 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -6,7 +6,7 @@ FROM --platform=linux/amd64 "${image}" # 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 467B942D3A79BD29 && break; done && \ - add-apt-repository 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' && \ + add-apt-repository 'deb http://repo.mysql.com/apt/debian/ bullseye 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 bullseye main' > /etc/apt/sources.list.d/percona.list && \ { \ From 4aede10e391ce236f5e0dc8649d96079b4c7f82a Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 11:56:46 +0200 Subject: [PATCH 12/53] test operator example with frouioui docker repo Signed-off-by: Florent Poinsard --- examples/operator/101_initial_cluster.yaml | 14 +++++++------- examples/operator/201_customer_tablets.yaml | 14 +++++++------- examples/operator/302_new_shards.yaml | 14 +++++++------- examples/operator/306_down_shard_0.yaml | 14 +++++++------- examples/operator/README.md | 14 +++++++------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 22cdc6f686d..39302efa257 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -8,14 +8,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtadmin: vitess/vtadmin:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtbackup: vitess/lite:latest - vtorc: vitess/lite:latest + vtctld: frouioui/lite:latest + vtadmin: vitess/vtadmin:v17.0.1-bullseye + vtgate: frouioui/lite:latest + vttablet: frouioui/lite:latest + vtbackup: frouioui/lite:latest + vtorc: frouioui/lite:latest mysqld: - mysql80Compatible: vitess/lite:latest + mysql80Compatible: frouioui/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/201_customer_tablets.yaml b/examples/operator/201_customer_tablets.yaml index 5800a5e05df..0fc232959bb 100644 --- a/examples/operator/201_customer_tablets.yaml +++ b/examples/operator/201_customer_tablets.yaml @@ -4,14 +4,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtadmin: vitess/vtadmin:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtbackup: vitess/lite:latest - vtorc: vitess/lite:latest + vtctld: frouioui/lite:latest + vtadmin: vitess/vtadmin:v17.0.1-bullseye + vtgate: frouioui/lite:latest + vttablet: frouioui/lite:latest + vtbackup: frouioui/lite:latest + vtorc: frouioui/lite:latest mysqld: - mysql80Compatible: vitess/lite:latest + mysql80Compatible: frouioui/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/302_new_shards.yaml b/examples/operator/302_new_shards.yaml index 2e15bc40d28..d021f075929 100644 --- a/examples/operator/302_new_shards.yaml +++ b/examples/operator/302_new_shards.yaml @@ -4,14 +4,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtadmin: vitess/vtadmin:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtbackup: vitess/lite:latest - vtorc: vitess/lite:latest + vtctld: frouioui/lite:latest + vtadmin: vitess/vtadmin:v17.0.1-bullseye + vtgate: frouioui/lite:latest + vttablet: frouioui/lite:latest + vtbackup: frouioui/lite:latest + vtorc: frouioui/lite:latest mysqld: - mysql80Compatible: vitess/lite:latest + mysql80Compatible: frouioui/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/306_down_shard_0.yaml b/examples/operator/306_down_shard_0.yaml index 4bdb694d678..6716f53560e 100644 --- a/examples/operator/306_down_shard_0.yaml +++ b/examples/operator/306_down_shard_0.yaml @@ -4,14 +4,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtadmin: vitess/vtadmin:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtbackup: vitess/lite:latest - vtorc: vitess/lite:latest + vtctld: frouioui/lite:latest + vtadmin: vitess/vtadmin:v17.0.1-bullseye + vtgate: frouioui/lite:latest + vttablet: frouioui/lite:latest + vtbackup: frouioui/lite:latest + vtorc: frouioui/lite:latest mysqld: - mysql80Compatible: vitess/lite:latest + mysql80Compatible: frouioui/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/README.md b/examples/operator/README.md index de2e598b516..ca7622c8eff 100644 --- a/examples/operator/README.md +++ b/examples/operator/README.md @@ -11,14 +11,14 @@ kubectl apply -f operator.yaml # NOTE: If you are using MySQL 8, update the images section to use mysql80 images # Example: # images: -# vtctld: vitess/lite:mysql80 -# vtadmin: vitess/vtadmin:latest -# vtgate: vitess/lite:mysql80 -# vttablet: vitess/lite:mysql80 -# vtbackup: vitess/lite:mysql80 -# vtorc: vitess/lite:mysql80 +# vtctld: frouioui/lite:mysql80 +# vtadmin: vitess/vtadmin:v17.0.1-bullseye +# vtgate: frouioui/lite:mysql80 +# vttablet: frouioui/lite:mysql80 +# vtbackup: frouioui/lite:mysql80 +# vtorc: frouioui/lite:mysql80 # mysqld: -# mysql80Compatible: vitess/lite:mysql80 +# mysql80Compatible: frouioui/lite:mysql80 kubectl apply -f 101_initial_cluster.yaml From b6e9049d9ead1326847467be6ceec100da23d7fa Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 12:14:53 +0200 Subject: [PATCH 13/53] remove add-apt-repo for mysql bullseye 57 Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index b69ed566cb9..99e68dea111 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -6,7 +6,7 @@ FROM --platform=linux/amd64 "${image}" # 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 467B942D3A79BD29 && break; done && \ - add-apt-repository 'deb http://repo.mysql.com/apt/debian/ bullseye mysql-5.7' && \ +# add-apt-repository 'deb http://repo.mysql.com/apt/debian/ bullseye 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 bullseye main' > /etc/apt/sources.list.d/percona.list && \ { \ From 25b5ce3d7de8a9b1f5138eef9a3796089ef1018c Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 14:02:08 +0200 Subject: [PATCH 14/53] install mysql57 from source in bootstrap mysql57 Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 99e68dea111..bf4258c1ef3 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -4,10 +4,18 @@ ARG image="vitess/bootstrap:${bootstrap_version}-common" FROM --platform=linux/amd64 "${image}" # Install MySQL 5.7 -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg dirmngr ca-certificates && \ +RUN apt-get update -y && 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 467B942D3A79BD29 && break; done && \ -# add-apt-repository 'deb http://repo.mysql.com/apt/debian/ bullseye mysql-5.7' && \ for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y apt-get install cmake gcc g++ bison libncurses5-dev libssl-dev && \ + wget https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.31.tar.gz && \ + tar xzf mysql-5.7.31.tar.gz && \ + cd mysql-5.7.31 && mkdir bld && cd bld && \ + cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. && \ + make && make install && \ + groupadd mysql && useradd -r -g mysql -s /bin/false mysql && cd /usr/local && sudo chown -R mysql:mysql ./mysql && \ + cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && \ + echo 'export PATH=$PATH:/usr/local/mysql/bin' >> ~/.bashrc && source ~/.bashrc && \ echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list && \ { \ echo debconf debconf/frontend select Noninteractive; \ @@ -15,7 +23,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins echo percona-server-server-5.7 percona-server-server/root_password_again password 'unused'; \ } | debconf-set-selections && \ apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y default-mysql-server && \ DEBIAN_FRONTEND=noninteractive apt-get install -y libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ rm -rf /var/lib/apt/lists/* From 5c1e18ffa6c4bf2b7a6126daacd1ac9fe8281d9f Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 14:06:14 +0200 Subject: [PATCH 15/53] fix typo in apt-get install instruction Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index bf4258c1ef3..4ad57011b06 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -7,7 +7,7 @@ FROM --platform=linux/amd64 "${image}" RUN apt-get update -y && 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 467B942D3A79BD29 && break; done && \ for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y apt-get install cmake gcc g++ bison libncurses5-dev libssl-dev && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y cmake gcc g++ bison libncurses5-dev libssl-dev && \ wget https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.31.tar.gz && \ tar xzf mysql-5.7.31.tar.gz && \ cd mysql-5.7.31 && mkdir bld && cd bld && \ From 534f74d85f24bb1b78c993e0af47c6cd5c91b121 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 14:37:21 +0200 Subject: [PATCH 16/53] remove unwanted sudo command and remove mysql57 installation steps from docker lite Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 2 +- docker/lite/install_dependencies.sh | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 4ad57011b06..a39eec14077 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -13,7 +13,7 @@ RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y --no- cd mysql-5.7.31 && mkdir bld && cd bld && \ cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. && \ make && make install && \ - groupadd mysql && useradd -r -g mysql -s /bin/false mysql && cd /usr/local && sudo chown -R mysql:mysql ./mysql && \ + groupadd mysql && useradd -r -g mysql -s /bin/false mysql && cd /usr/local && chown -R mysql:mysql ./mysql && \ cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && \ echo 'export PATH=$PATH:/usr/local/mysql/bin' >> ~/.bashrc && source ~/.bashrc && \ echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list && \ diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index c9b19107d7c..79d9818c6d6 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -66,22 +66,6 @@ apt-get install -y --no-install-recommends "${BASE_PACKAGES[@]}" # Packages specific to certain flavors. case "${FLAVOR}" in -mysql57) - mysql57_version=5.7.31 - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/libmysqlclient20_${mysql57_version}-1debian10_amd64.deb /tmp/libmysqlclient20_${mysql57_version}-1debian10_amd64.deb - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-community-client_${mysql57_version}-1debian10_amd64.deb /tmp/mysql-community-client_${mysql57_version}-1debian10_amd64.deb - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-client_${mysql57_version}-1debian10_amd64.deb /tmp/mysql-client_${mysql57_version}-1debian10_amd64.deb - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-community-server_${mysql57_version}-1debian10_amd64.deb /tmp/mysql-community-server_${mysql57_version}-1debian10_amd64.deb - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-server_${mysql57_version}-1debian10_amd64.deb /tmp/mysql-server_${mysql57_version}-1debian10_amd64.deb - PACKAGES=( - /tmp/libmysqlclient20_${mysql57_version}-1debian10_amd64.deb - /tmp/mysql-community-client_${mysql57_version}-1debian10_amd64.deb - /tmp/mysql-client_${mysql57_version}-1debian10_amd64.deb - /tmp/mysql-community-server_${mysql57_version}-1debian10_amd64.deb - /tmp/mysql-server_${mysql57_version}-1debian10_amd64.deb - percona-xtrabackup-24 - ) - ;; mysql80) mysql8_version=8.0.30 do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-common_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-common_${mysql8_version}-1debian10_amd64.deb @@ -144,9 +128,6 @@ add_apt_key 9334A25F8507EFA5 # Add extra apt repositories for MySQL. case "${FLAVOR}" in -mysql57) - echo 'deb http://repo.mysql.com/apt/debian/ bullseye mysql-5.7' > /etc/apt/sources.list.d/mysql.list - ;; mysql80) echo 'deb http://repo.mysql.com/apt/debian/ bullseye mysql-8.0' > /etc/apt/sources.list.d/mysql.list ;; From e70b871f158d13113c76bf7b2e56824137884ee6 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 15:08:34 +0200 Subject: [PATCH 17/53] install source Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index a39eec14077..be957f5cdbf 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -7,7 +7,7 @@ FROM --platform=linux/amd64 "${image}" RUN apt-get update -y && 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 467B942D3A79BD29 && break; done && \ for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y cmake gcc g++ bison libncurses5-dev libssl-dev && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y cmake gcc g++ bison libncurses5-dev libssl-dev source && \ wget https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.31.tar.gz && \ tar xzf mysql-5.7.31.tar.gz && \ cd mysql-5.7.31 && mkdir bld && cd bld && \ From e0b0e92f7c42e4883e2010bc70759d474bb19ed2 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 15:12:48 +0200 Subject: [PATCH 18/53] remove install and usage of source Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index be957f5cdbf..85d5ed3232d 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -7,7 +7,7 @@ FROM --platform=linux/amd64 "${image}" RUN apt-get update -y && 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 467B942D3A79BD29 && break; done && \ for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y cmake gcc g++ bison libncurses5-dev libssl-dev source && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y cmake gcc g++ bison libncurses5-dev libssl-dev && \ wget https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.31.tar.gz && \ tar xzf mysql-5.7.31.tar.gz && \ cd mysql-5.7.31 && mkdir bld && cd bld && \ @@ -15,7 +15,7 @@ RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y --no- make && make install && \ groupadd mysql && useradd -r -g mysql -s /bin/false mysql && cd /usr/local && chown -R mysql:mysql ./mysql && \ cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && \ - echo 'export PATH=$PATH:/usr/local/mysql/bin' >> ~/.bashrc && source ~/.bashrc && \ + echo 'export PATH=$PATH:/usr/local/mysql/bin' >> ~/.bashrc && . ~/.bashrc && \ echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list && \ { \ echo debconf debconf/frontend select Noninteractive; \ From a5b46d2d42db0c2b249fd623a2fedbc7c84784d9 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 17:25:34 +0200 Subject: [PATCH 19/53] use mysql57 in the 101 operator example Signed-off-by: Florent Poinsard --- examples/operator/101_initial_cluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 39302efa257..338b1857fb3 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -15,7 +15,7 @@ spec: vtbackup: frouioui/lite:latest vtorc: frouioui/lite:latest mysqld: - mysql80Compatible: frouioui/lite:latest + mysql57Compatible: frouioui/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 From 585b4cd2a429d5a355837e15bd22281b5f65bcb7 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 17:28:30 +0200 Subject: [PATCH 20/53] use mysql56Compatible in the 101 operator example Signed-off-by: Florent Poinsard --- examples/operator/101_initial_cluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 338b1857fb3..b0b1fbb9feb 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -15,7 +15,7 @@ spec: vtbackup: frouioui/lite:latest vtorc: frouioui/lite:latest mysqld: - mysql57Compatible: frouioui/lite:latest + mysql56Compatible: frouioui/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 From 57a31d2266d0c416eaa59cca88d055051bc78102 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 17:41:15 +0200 Subject: [PATCH 21/53] [debug] revert to vitess/lite:v17.0.1 for testing purpose Signed-off-by: Florent Poinsard --- examples/operator/101_initial_cluster.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index b0b1fbb9feb..307db00317b 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -8,14 +8,14 @@ metadata: name: example spec: images: - vtctld: frouioui/lite:latest - vtadmin: vitess/vtadmin:v17.0.1-bullseye - vtgate: frouioui/lite:latest - vttablet: frouioui/lite:latest - vtbackup: frouioui/lite:latest - vtorc: frouioui/lite:latest + vtctld: vitess/lite:v17.0.1 + vtadmin: vitess/vtadmin:v17.0.1 + vtgate: vitess/lite:v17.0.1 + vttablet: vitess/lite:v17.0.1 + vtbackup: vitess/lite:v17.0.1 + vtorc: vitess/lite:v17.0.1 mysqld: - mysql56Compatible: frouioui/lite:latest + mysql56Compatible: vitess/lite:v17.0.1 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 From 9b54f9913ad4a30bab83df6cd27c2aa4b7763267 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 17:49:30 +0200 Subject: [PATCH 22/53] add mysql57 case in install_dependencies.sh Signed-off-by: Florent Poinsard --- docker/lite/install_dependencies.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index 79d9818c6d6..ccc0ffad378 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -66,6 +66,8 @@ apt-get install -y --no-install-recommends "${BASE_PACKAGES[@]}" # Packages specific to certain flavors. case "${FLAVOR}" in +mysql57) + ;; mysql80) mysql8_version=8.0.30 do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-common_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-common_${mysql8_version}-1debian10_amd64.deb From f875919a899a01406cbe66a23c17aeefab1612d6 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 17:53:29 +0200 Subject: [PATCH 23/53] use frouioui for docker_lite_target push Signed-off-by: Florent Poinsard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f4de8dcef46..b4f69a2739b 100644 --- a/Makefile +++ b/Makefile @@ -325,7 +325,7 @@ docker_lite: 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:$*} + ${call build_docker_image,docker/lite/Dockerfile.$*,frouioui/lite:$*} docker_lite_all: docker_lite $(DOCKER_LITE_TARGETS) From cfdd17bdb5ab0f84e9a299adf69b03ccc91e914f Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 17:57:59 +0200 Subject: [PATCH 24/53] use frouioui/lite:mysql57 in 101 Signed-off-by: Florent Poinsard --- examples/operator/101_initial_cluster.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 307db00317b..90eeda97fb2 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -8,14 +8,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v17.0.1 + vtctld: frouioui/lite:mysql57 vtadmin: vitess/vtadmin:v17.0.1 - vtgate: vitess/lite:v17.0.1 - vttablet: vitess/lite:v17.0.1 - vtbackup: vitess/lite:v17.0.1 - vtorc: vitess/lite:v17.0.1 + vtgate: frouioui/lite:mysql57 + vttablet: frouioui/lite:mysql57 + vtbackup: frouioui/lite:mysql57 + vtorc: frouioui/lite:mysql57 mysqld: - mysql56Compatible: vitess/lite:v17.0.1 + mysql56Compatible: frouioui/lite:mysql57 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 From a04ed593c00bd2fe145130e73316c8cfba7e7497 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 18:07:46 +0200 Subject: [PATCH 25/53] install mysql57 in install_dependencies instead of the bootstrap image Signed-off-by: Florent Poinsard --- docker/bootstrap/Dockerfile.mysql57 | 9 --------- docker/lite/install_dependencies.sh | 11 ++++++++++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 85d5ed3232d..85d22144acc 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -7,15 +7,6 @@ FROM --platform=linux/amd64 "${image}" RUN apt-get update -y && 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 467B942D3A79BD29 && break; done && \ for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y cmake gcc g++ bison libncurses5-dev libssl-dev && \ - wget https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.31.tar.gz && \ - tar xzf mysql-5.7.31.tar.gz && \ - cd mysql-5.7.31 && mkdir bld && cd bld && \ - cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. && \ - make && make install && \ - groupadd mysql && useradd -r -g mysql -s /bin/false mysql && cd /usr/local && chown -R mysql:mysql ./mysql && \ - cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && \ - echo 'export PATH=$PATH:/usr/local/mysql/bin' >> ~/.bashrc && . ~/.bashrc && \ echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list && \ { \ echo debconf debconf/frontend select Noninteractive; \ diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index ccc0ffad378..36314e4e84e 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -67,7 +67,16 @@ apt-get install -y --no-install-recommends "${BASE_PACKAGES[@]}" # Packages specific to certain flavors. case "${FLAVOR}" in mysql57) - ;; + DEBIAN_FRONTEND=noninteractive apt-get install -y cmake gcc g++ bison libncurses5-dev libssl-dev + wget https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.31.tar.gz + tar xzf mysql-5.7.31.tar.gz + cd mysql-5.7.31 && mkdir bld && cd bld + cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. + make && make install + groupadd mysql && useradd -r -g mysql -s /bin/false mysql && cd /usr/local && chown -R mysql:mysql ./mysql + cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql + echo 'export PATH=$PATH:/usr/local/mysql/bin' >> ~/.bashrc && . ~/.bashrc + ;; mysql80) mysql8_version=8.0.30 do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-common_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-common_${mysql8_version}-1debian10_amd64.deb From df325252cdd8b6da4d39ef0ff92bbe09442715f1 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 18:18:42 +0200 Subject: [PATCH 26/53] add pkg-config to list of deps to install for lite-mysql57 Signed-off-by: Florent Poinsard --- docker/lite/install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index 36314e4e84e..8b0a9f10270 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -67,7 +67,7 @@ apt-get install -y --no-install-recommends "${BASE_PACKAGES[@]}" # Packages specific to certain flavors. case "${FLAVOR}" in mysql57) - DEBIAN_FRONTEND=noninteractive apt-get install -y cmake gcc g++ bison libncurses5-dev libssl-dev + DEBIAN_FRONTEND=noninteractive apt-get install -y pkg-config cmake gcc g++ bison libncurses5-dev libssl-dev wget https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.31.tar.gz tar xzf mysql-5.7.31.tar.gz cd mysql-5.7.31 && mkdir bld && cd bld From 271c7ef2a38fb0b6ed5dde6ddfc1618695500b90 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 19:09:04 +0200 Subject: [PATCH 27/53] use proper path for mysql binaries Signed-off-by: Florent Poinsard --- docker/lite/install_dependencies.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index 8b0a9f10270..7abf26bbede 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -74,8 +74,7 @@ mysql57) cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. make && make install groupadd mysql && useradd -r -g mysql -s /bin/false mysql && cd /usr/local && chown -R mysql:mysql ./mysql - cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql - echo 'export PATH=$PATH:/usr/local/mysql/bin' >> ~/.bashrc && . ~/.bashrc + cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && cp ./bin/* /usr/local/bin/ ;; mysql80) mysql8_version=8.0.30 From 96731eec2728f8a152697e6275cad9909785b57a Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 1 Aug 2023 19:55:13 +0200 Subject: [PATCH 28/53] move all binaries to /usr/bin Signed-off-by: Florent Poinsard --- docker/lite/install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index 7abf26bbede..f24bdcceb8e 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -74,7 +74,7 @@ mysql57) cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. make && make install groupadd mysql && useradd -r -g mysql -s /bin/false mysql && cd /usr/local && chown -R mysql:mysql ./mysql - cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && cp ./bin/* /usr/local/bin/ + cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && cp ./bin/* /usr/bin/ ;; mysql80) mysql8_version=8.0.30 From b249baf905c150095d6d260a03e2f2adcbf7e9c6 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 2 Aug 2023 10:39:55 +0200 Subject: [PATCH 29/53] debug mysql root path finding Signed-off-by: Florent Poinsard --- go/vt/mysqlctl/mysqld.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go/vt/mysqlctl/mysqld.go b/go/vt/mysqlctl/mysqld.go index 15ced99bfa8..391ba618df3 100644 --- a/go/vt/mysqlctl/mysqld.go +++ b/go/vt/mysqlctl/mysqld.go @@ -193,6 +193,7 @@ func GetVersionString() (string, error) { if err != nil { return "", err } + log.Infof("MySQL root", mysqlRoot) mysqldPath, err := binaryPath(mysqlRoot, "mysqld") if err != nil { return "", err @@ -598,6 +599,7 @@ func binaryPath(root, binary string) (string, error) { subdirs := []string{"sbin", "bin", "libexec", "scripts"} for _, subdir := range subdirs { binPath := path.Join(root, subdir, binary) + log.Infof("Path tried:", binPath) if _, err := os.Stat(binPath); err == nil { return binPath, nil } @@ -1428,7 +1430,7 @@ func noSocketFile() { if socketFile != "" { // We log an error for now until we fix the issue with ApplySchema surfacing in MoveTables. // See https://github.com/vitessio/vitess/issues/13203 and https://github.com/vitessio/vitess/pull/13178 - //panic("Running remotely through mysqlctl, socketFile must not be set") + // panic("Running remotely through mysqlctl, socketFile must not be set") log.Warning("Running remotely through mysqlctl and thus socketFile should not be set") } } From 18162e4ae5f8195462a7631e74c119284048ab88 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 2 Aug 2023 11:02:25 +0200 Subject: [PATCH 30/53] improve data dir init and use vitess user Signed-off-by: Florent Poinsard --- docker/lite/install_dependencies.sh | 2 +- go/vt/mysqlctl/mysqld.go | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index f24bdcceb8e..3c8cbc9361c 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -73,7 +73,7 @@ mysql57) cd mysql-5.7.31 && mkdir bld && cd bld cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. make && make install - groupadd mysql && useradd -r -g mysql -s /bin/false mysql && cd /usr/local && chown -R mysql:mysql ./mysql + groupadd mysql && useradd -r -g mysql -s /bin/false vitess && cd /usr/local && chown -R vitess:mysql ./mysql-files && chmod 750 ./mysql-files cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && cp ./bin/* /usr/bin/ ;; mysql80) diff --git a/go/vt/mysqlctl/mysqld.go b/go/vt/mysqlctl/mysqld.go index 391ba618df3..f2cc1488fe2 100644 --- a/go/vt/mysqlctl/mysqld.go +++ b/go/vt/mysqlctl/mysqld.go @@ -193,7 +193,6 @@ func GetVersionString() (string, error) { if err != nil { return "", err } - log.Infof("MySQL root", mysqlRoot) mysqldPath, err := binaryPath(mysqlRoot, "mysqld") if err != nil { return "", err @@ -599,7 +598,6 @@ func binaryPath(root, binary string) (string, error) { subdirs := []string{"sbin", "bin", "libexec", "scripts"} for _, subdir := range subdirs { binPath := path.Join(root, subdir, binary) - log.Infof("Path tried:", binPath) if _, err := os.Stat(binPath); err == nil { return binPath, nil } From c42662377e266ae28ebd4f4733442195b7107dee Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 2 Aug 2023 11:47:07 +0200 Subject: [PATCH 31/53] fix the add to group insdtruction Signed-off-by: Florent Poinsard --- docker/lite/install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index 3c8cbc9361c..4a67d2eb8c9 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -73,7 +73,7 @@ mysql57) cd mysql-5.7.31 && mkdir bld && cd bld cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. make && make install - groupadd mysql && useradd -r -g mysql -s /bin/false vitess && cd /usr/local && chown -R vitess:mysql ./mysql-files && chmod 750 ./mysql-files + groupadd mysql && useradd -a -G mysql vitess && cd /usr/local && chown -R vitess:mysql ./mysql-files && chmod 750 ./mysql-files cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && cp ./bin/* /usr/bin/ ;; mysql80) From e4b735426d28274415b15a44653045f8a9cf7aec Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 2 Aug 2023 15:03:40 +0200 Subject: [PATCH 32/53] use usermod Signed-off-by: Florent Poinsard --- docker/lite/install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index 4a67d2eb8c9..12dac60721d 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -73,7 +73,7 @@ mysql57) cd mysql-5.7.31 && mkdir bld && cd bld cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. make && make install - groupadd mysql && useradd -a -G mysql vitess && cd /usr/local && chown -R vitess:mysql ./mysql-files && chmod 750 ./mysql-files + groupadd mysql && usermod -a -G mysql vitess && cd /usr/local && chown -R vitess:mysql ./mysql-files && chmod 750 ./mysql-files cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && cp ./bin/* /usr/bin/ ;; mysql80) From 256f2f7a1e5d36633f7e979dba414e20a6fc716c Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 2 Aug 2023 15:38:23 +0200 Subject: [PATCH 33/53] add vitess user Signed-off-by: Florent Poinsard --- docker/lite/install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index 12dac60721d..08a9a79cae7 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -73,7 +73,7 @@ mysql57) cd mysql-5.7.31 && mkdir bld && cd bld cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. make && make install - groupadd mysql && usermod -a -G mysql vitess && cd /usr/local && chown -R vitess:mysql ./mysql-files && chmod 750 ./mysql-files + groupadd mysql && useradd vitess && usermod -a -G mysql vitess && cd /usr/local && chown -R vitess:mysql ./mysql-files && chmod 750 ./mysql-files cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && cp ./bin/* /usr/bin/ ;; mysql80) From b8dc250eec905cc8b582333628333da8822da596 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 2 Aug 2023 16:42:42 +0200 Subject: [PATCH 34/53] follow proper data dir init steps Signed-off-by: Florent Poinsard --- docker/lite/install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index 08a9a79cae7..6a618a5e3eb 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -73,7 +73,7 @@ mysql57) cd mysql-5.7.31 && mkdir bld && cd bld cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. make && make install - groupadd mysql && useradd vitess && usermod -a -G mysql vitess && cd /usr/local && chown -R vitess:mysql ./mysql-files && chmod 750 ./mysql-files + groupadd mysql && useradd -r -g mysql -s /bin/false mysql && cd /usr/local/mysql && mkdir mysql-files && chown -R mysql:mysql ./mysql-files && chmod 750 ./mysql-files cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && cp ./bin/* /usr/bin/ ;; mysql80) From 9a9dd863c8b0fd40ce91a741d04ff81290063824 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 2 Aug 2023 17:51:31 +0200 Subject: [PATCH 35/53] tweak permissions Signed-off-by: Florent Poinsard --- docker/lite/install_dependencies.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index 6a618a5e3eb..ed6ef9120dd 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -73,8 +73,10 @@ mysql57) cd mysql-5.7.31 && mkdir bld && cd bld cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. make && make install - groupadd mysql && useradd -r -g mysql -s /bin/false mysql && cd /usr/local/mysql && mkdir mysql-files && chown -R mysql:mysql ./mysql-files && chmod 750 ./mysql-files - cd /usr/local/mysql && bin/mysqld --initialize-insecure --user=mysql && cp ./bin/* /usr/bin/ + groupadd mysqlgroup + usermod -aG mysqlgroup vitess + cd /usr/local/ && chown -R root:mysqlgroup ./mysql && chmod -R 775 ./mysql/ + cd mysql && cp ./bin/* /usr/bin/ ;; mysql80) mysql8_version=8.0.30 From 799132d61ae6b59f099fd10ce5dabf23105c5915 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 3 Aug 2023 16:36:36 +0200 Subject: [PATCH 36/53] Bump bootstrap version to 20 and add new common-mysql57 image to remain on buster Signed-off-by: Florent Poinsard --- Makefile | 4 +- docker/base/Dockerfile | 2 +- docker/base/Dockerfile.mysql57 | 2 +- docker/base/Dockerfile.percona57 | 2 +- docker/base/Dockerfile.percona80 | 2 +- docker/bootstrap/CHANGELOG.md | 6 +- docker/bootstrap/Dockerfile.common | 2 +- docker/bootstrap/Dockerfile.common-mysql57 | 50 ++++++++++++++++ docker/bootstrap/Dockerfile.mysql57 | 9 +-- docker/lite/Dockerfile.mysql57 | 4 +- docker/lite/Dockerfile.mysql80 | 2 +- docker/lite/Dockerfile.percona57 | 2 +- docker/lite/Dockerfile.percona80 | 2 +- docker/lite/Dockerfile.testing | 2 +- docker/lite/Dockerfile.ubi7.mysql57 | 2 +- docker/lite/Dockerfile.ubi7.mysql80 | 2 +- docker/lite/Dockerfile.ubi7.percona57 | 2 +- docker/lite/Dockerfile.ubi7.percona80 | 2 +- docker/lite/Dockerfile.ubi8.arm64.mysql80 | 2 +- docker/lite/Dockerfile.ubi8.mysql80 | 2 +- docker/lite/install_dependencies.sh | 70 ++++++++++++---------- docker/local/Dockerfile | 2 +- docker/vttestserver/Dockerfile.mysql57 | 4 +- docker/vttestserver/Dockerfile.mysql80 | 2 +- test/templates/dockerfile.tpl | 2 +- 25 files changed, 124 insertions(+), 59 deletions(-) create mode 100644 docker/bootstrap/Dockerfile.common-mysql57 diff --git a/Makefile b/Makefile index b4f69a2739b..df0047b5714 100644 --- a/Makefile +++ b/Makefile @@ -272,8 +272,8 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto # This rule builds the bootstrap images for all flavors. DOCKER_IMAGES_FOR_TEST = mysql57 mysql80 percona57 percona80 -DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST) -BOOTSTRAP_VERSION=19 +DOCKER_IMAGES = common common-mysql57 $(DOCKER_IMAGES_FOR_TEST) +BOOTSTRAP_VERSION=20 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 b/docker/base/Dockerfile index aa9b00e342d..4047c754fe7 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" diff --git a/docker/base/Dockerfile.mysql57 b/docker/base/Dockerfile.mysql57 index eabb5106535..03ca8c196f9 100644 --- a/docker/base/Dockerfile.mysql57 +++ b/docker/base/Dockerfile.mysql57 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57 index c08e57ab7cc..ae0d4e110db 100644 --- a/docker/base/Dockerfile.percona57 +++ b/docker/base/Dockerfile.percona57 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-percona57" FROM "${image}" diff --git a/docker/base/Dockerfile.percona80 b/docker/base/Dockerfile.percona80 index 5c78c1ffe84..af7be6249b0 100644 --- a/docker/base/Dockerfile.percona80 +++ b/docker/base/Dockerfile.percona80 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-percona80" FROM "${image}" diff --git a/docker/bootstrap/CHANGELOG.md b/docker/bootstrap/CHANGELOG.md index 707191d61e8..88cfdd06a66 100644 --- a/docker/bootstrap/CHANGELOG.md +++ b/docker/bootstrap/CHANGELOG.md @@ -72,4 +72,8 @@ List of changes between bootstrap image versions. ## [19] - 2023-06-07 ### Changes -- Update build to golang 1.20.5 \ No newline at end of file +- Update build to golang 1.20.5 + +## [20] - 2023-08-03 +### Changes +- Bump all images (besides mysql57) to bullseye base image \ No newline at end of file diff --git a/docker/bootstrap/Dockerfile.common b/docker/bootstrap/Dockerfile.common index 46c1175415c..8922081cc87 100644 --- a/docker/bootstrap/Dockerfile.common +++ b/docker/bootstrap/Dockerfile.common @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 golang:1.20.6-bullseye +FROM --platform=linux/amd64 golang:1.20.5-bullseye # Install Vitess build dependencies RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ diff --git a/docker/bootstrap/Dockerfile.common-mysql57 b/docker/bootstrap/Dockerfile.common-mysql57 new file mode 100644 index 00000000000..3f8e7d68a59 --- /dev/null +++ b/docker/bootstrap/Dockerfile.common-mysql57 @@ -0,0 +1,50 @@ +FROM --platform=linux/amd64 golang:1.20.5-buster + +# Install Vitess build dependencies +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # TODO(mberlin): Group these to make it easier to understand which library actually requires them. + ant \ + chromium \ + curl \ + default-jdk \ + etcd \ + g++ \ + git \ + make \ + maven \ + software-properties-common \ + unzip \ + zip \ + xvfb \ + && rm -rf /var/lib/apt/lists/* + +# Set up Vitess environment (equivalent to '. dev.env') +ENV VTROOT /vt/src/vitess.io/vitess +ENV VTDATAROOT /vt/vtdataroot +ENV VTPORTSTART 15000 +ENV PATH $VTROOT/bin:$VTROOT/dist/maven/bin:$PATH +ENV USER vitess + +# Copy files needed for bootstrap +COPY bootstrap.sh dev.env build.env go.mod go.sum /vt/src/vitess.io/vitess/ +COPY config /vt/src/vitess.io/vitess/config +COPY tools /vt/src/vitess.io/vitess/tools + +# Create vitess user +RUN groupadd -r vitess && useradd -r -g vitess vitess && \ + mkdir -p /vt/vtdataroot /home/vitess && \ + chown -R vitess:vitess /vt /home/vitess + +# Download vendored Go dependencies +RUN cd /vt/src/vitess.io/vitess && \ + su vitess -c "/usr/local/go/bin/go mod download" + +# Create mount point for actual data (e.g. MySQL data dir) +VOLUME /vt/vtdataroot + +# The docker lite images copy from the builder in /vt/bin +# Add compatibility to the previous layout for now +RUN su vitess -c "mkdir -p /vt/src/vitess.io/vitess/bin && rm -rf /vt/bin && ln -s /vt/src/vitess.io/vitess/bin /vt/bin" + +# If the user doesn't specify a command, load a shell. +CMD ["/bin/bash"] diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 85d22144acc..793eaa11222 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -1,20 +1,21 @@ ARG bootstrap_version -ARG image="vitess/bootstrap:${bootstrap_version}-common" +ARG image="vitess/bootstrap:${bootstrap_version}-common-mysql57" FROM --platform=linux/amd64 "${image}" # Install MySQL 5.7 -RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg dirmngr ca-certificates && \ +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 467B942D3A79BD29 && 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 bullseye main' > /etc/apt/sources.list.d/percona.list && \ + 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 && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \ + 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/* # Bootstrap Vitess diff --git a/docker/lite/Dockerfile.mysql57 b/docker/lite/Dockerfile.mysql57 index a6dbd6476e1..83d6dd205ed 100644 --- a/docker/lite/Dockerfile.mysql57 +++ b/docker/lite/Dockerfile.mysql57 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder @@ -33,7 +33,7 @@ USER vitess RUN make install PREFIX=/vt/install # Start over and build the final image. -FROM debian:bullseye-slim +FROM debian:buster-slim # Install dependencies COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh diff --git a/docker/lite/Dockerfile.mysql80 b/docker/lite/Dockerfile.mysql80 index a7717140ca9..022de0fb39a 100644 --- a/docker/lite/Dockerfile.mysql80 +++ b/docker/lite/Dockerfile.mysql80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.percona57 b/docker/lite/Dockerfile.percona57 index 2bab8ce4c60..6c18a75893c 100644 --- a/docker/lite/Dockerfile.percona57 +++ b/docker/lite/Dockerfile.percona57 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-percona57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.percona80 b/docker/lite/Dockerfile.percona80 index 0827a44963f..f6a47fe8c91 100644 --- a/docker/lite/Dockerfile.percona80 +++ b/docker/lite/Dockerfile.percona80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-percona80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.testing b/docker/lite/Dockerfile.testing index a9846512492..263743af7b5 100644 --- a/docker/lite/Dockerfile.testing +++ b/docker/lite/Dockerfile.testing @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.mysql57 b/docker/lite/Dockerfile.ubi7.mysql57 index 8c164dec48f..f3b64cda07b 100644 --- a/docker/lite/Dockerfile.ubi7.mysql57 +++ b/docker/lite/Dockerfile.ubi7.mysql57 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.mysql80 b/docker/lite/Dockerfile.ubi7.mysql80 index c5d1b4b5f7f..ed6d063c88d 100644 --- a/docker/lite/Dockerfile.ubi7.mysql80 +++ b/docker/lite/Dockerfile.ubi7.mysql80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.percona57 b/docker/lite/Dockerfile.ubi7.percona57 index 86b0db5ba49..435e985cb45 100644 --- a/docker/lite/Dockerfile.ubi7.percona57 +++ b/docker/lite/Dockerfile.ubi7.percona57 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-percona57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.percona80 b/docker/lite/Dockerfile.ubi7.percona80 index 4a28ec901cc..4cc4941584a 100644 --- a/docker/lite/Dockerfile.ubi7.percona80 +++ b/docker/lite/Dockerfile.ubi7.percona80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-percona80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi8.arm64.mysql80 b/docker/lite/Dockerfile.ubi8.arm64.mysql80 index 39fb385d900..ba2c8db7b60 100644 --- a/docker/lite/Dockerfile.ubi8.arm64.mysql80 +++ b/docker/lite/Dockerfile.ubi8.arm64.mysql80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi8.mysql80 b/docker/lite/Dockerfile.ubi8.mysql80 index 68ffa0f6949..9db13e3e301 100644 --- a/docker/lite/Dockerfile.ubi8.mysql80 +++ b/docker/lite/Dockerfile.ubi8.mysql80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index ed6ef9120dd..2175df5def3 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -67,38 +67,42 @@ apt-get install -y --no-install-recommends "${BASE_PACKAGES[@]}" # Packages specific to certain flavors. case "${FLAVOR}" in mysql57) - DEBIAN_FRONTEND=noninteractive apt-get install -y pkg-config cmake gcc g++ bison libncurses5-dev libssl-dev - wget https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.31.tar.gz - tar xzf mysql-5.7.31.tar.gz - cd mysql-5.7.31 && mkdir bld && cd bld - cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp -SSL=system .. - make && make install - groupadd mysqlgroup - usermod -aG mysqlgroup vitess - cd /usr/local/ && chown -R root:mysqlgroup ./mysql && chmod -R 775 ./mysql/ - cd mysql && cp ./bin/* /usr/bin/ - ;; + mysql57_version=5.7.31 + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/libmysqlclient20_${mysql57_version}-1debian10_amd64.deb /tmp/libmysqlclient20_${mysql57_version}-1debian10_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-community-client_${mysql57_version}-1debian10_amd64.deb /tmp/mysql-community-client_${mysql57_version}-1debian10_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-client_${mysql57_version}-1debian10_amd64.deb /tmp/mysql-client_${mysql57_version}-1debian10_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-community-server_${mysql57_version}-1debian10_amd64.deb /tmp/mysql-community-server_${mysql57_version}-1debian10_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-server_${mysql57_version}-1debian10_amd64.deb /tmp/mysql-server_${mysql57_version}-1debian10_amd64.deb + PACKAGES=( + /tmp/libmysqlclient20_${mysql57_version}-1debian10_amd64.deb + /tmp/mysql-community-client_${mysql57_version}-1debian10_amd64.deb + /tmp/mysql-client_${mysql57_version}-1debian10_amd64.deb + /tmp/mysql-community-server_${mysql57_version}-1debian10_amd64.deb + /tmp/mysql-server_${mysql57_version}-1debian10_amd64.deb + percona-xtrabackup-24 + ) + ;; mysql80) mysql8_version=8.0.30 - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-common_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-common_${mysql8_version}-1debian10_amd64.deb - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/libmysqlclient21_${mysql8_version}-1debian10_amd64.deb /tmp/libmysqlclient21_${mysql8_version}-1debian10_amd64.deb - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-core_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-community-client-core_${mysql8_version}-1debian10_amd64.deb - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-plugins_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-community-client-plugins_${mysql8_version}-1debian10_amd64.deb - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-community-client_${mysql8_version}-1debian10_amd64.deb - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-client_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-client_${mysql8_version}-1debian10_amd64.deb - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server-core_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-community-server-core_${mysql8_version}-1debian10_amd64.deb - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-community-server_${mysql8_version}-1debian10_amd64.deb - do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-server_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-server_${mysql8_version}-1debian10_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-common_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-common_${mysql8_version}-1debian11_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/libmysqlclient21_${mysql8_version}-1debian11_amd64.deb /tmp/libmysqlclient21_${mysql8_version}-1debian11_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-core_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-community-client-core_${mysql8_version}-1debian11_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-plugins_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-community-client-plugins_${mysql8_version}-1debian11_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-community-client_${mysql8_version}-1debian11_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-client_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-client_${mysql8_version}-1debian11_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server-core_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-community-server-core_${mysql8_version}-1debian11_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-community-server_${mysql8_version}-1debian11_amd64.deb + do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-server_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-server_${mysql8_version}-1debian11_amd64.deb PACKAGES=( - /tmp/mysql-common_${mysql8_version}-1debian10_amd64.deb - /tmp/libmysqlclient21_${mysql8_version}-1debian10_amd64.deb - /tmp/mysql-community-client-core_${mysql8_version}-1debian10_amd64.deb - /tmp/mysql-community-client-plugins_${mysql8_version}-1debian10_amd64.deb - /tmp/mysql-community-client_${mysql8_version}-1debian10_amd64.deb - /tmp/mysql-client_${mysql8_version}-1debian10_amd64.deb - /tmp/mysql-community-server-core_${mysql8_version}-1debian10_amd64.deb - /tmp/mysql-community-server_${mysql8_version}-1debian10_amd64.deb - /tmp/mysql-server_${mysql8_version}-1debian10_amd64.deb + /tmp/mysql-common_${mysql8_version}-1debian11_amd64.deb + /tmp/libmysqlclient21_${mysql8_version}-1debian11_amd64.deb + /tmp/mysql-community-client-core_${mysql8_version}-1debian11_amd64.deb + /tmp/mysql-community-client-plugins_${mysql8_version}-1debian11_amd64.deb + /tmp/mysql-community-client_${mysql8_version}-1debian11_amd64.deb + /tmp/mysql-client_${mysql8_version}-1debian11_amd64.deb + /tmp/mysql-community-server-core_${mysql8_version}-1debian11_amd64.deb + /tmp/mysql-community-server_${mysql8_version}-1debian11_amd64.deb + /tmp/mysql-server_${mysql8_version}-1debian11_amd64.deb percona-xtrabackup-80 ) ;; @@ -140,6 +144,9 @@ add_apt_key 9334A25F8507EFA5 # Add extra apt repositories for MySQL. case "${FLAVOR}" in +mysql57) + echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list + ;; mysql80) echo 'deb http://repo.mysql.com/apt/debian/ bullseye mysql-8.0' > /etc/apt/sources.list.d/mysql.list ;; @@ -147,7 +154,10 @@ esac # Add extra apt repositories for Percona Server and/or Percona XtraBackup. case "${FLAVOR}" in -mysql57|mysql80|percona57) +mysql57) + echo 'deb http://repo.percona.com/apt buster main' > /etc/apt/sources.list.d/percona.list + ;; +mysql80|percona57) echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list ;; percona80) diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile index 9acf7f362a5..3610cfe1b4d 100644 --- a/docker/local/Dockerfile +++ b/docker/local/Dockerfile @@ -1,4 +1,4 @@ -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-common" FROM "${image}" diff --git a/docker/vttestserver/Dockerfile.mysql57 b/docker/vttestserver/Dockerfile.mysql57 index c5b2da1f2b3..c2705fddacd 100644 --- a/docker/vttestserver/Dockerfile.mysql57 +++ b/docker/vttestserver/Dockerfile.mysql57 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder @@ -33,7 +33,7 @@ USER vitess RUN make install-testing PREFIX=/vt/install # Start over and build the final image. -FROM debian:bullseye-slim +FROM debian:buster-slim # Install dependencies COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh diff --git a/docker/vttestserver/Dockerfile.mysql80 b/docker/vttestserver/Dockerfile.mysql80 index bbb63c99541..5c673ff4d5f 100644 --- a/docker/vttestserver/Dockerfile.mysql80 +++ b/docker/vttestserver/Dockerfile.mysql80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/test/templates/dockerfile.tpl b/test/templates/dockerfile.tpl index d7ba49685d0..6b252c6ba2b 100644 --- a/test/templates/dockerfile.tpl +++ b/test/templates/dockerfile.tpl @@ -1,4 +1,4 @@ -ARG bootstrap_version=19 +ARG bootstrap_version=20 ARG image="vitess/bootstrap:${bootstrap_version}-{{.Platform}}" FROM "${image}" From d2bddf8229b807af6877b1781baaac3aae309431 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 3 Aug 2023 18:06:46 +0200 Subject: [PATCH 37/53] [debug] use frouioui for bootstrap images Signed-off-by: Florent Poinsard --- docker/lite/Dockerfile.mysql57 | 2 +- docker/lite/Dockerfile.mysql80 | 2 +- docker/lite/Dockerfile.percona57 | 2 +- docker/lite/Dockerfile.percona80 | 2 +- docker/lite/Dockerfile.testing | 2 +- docker/lite/Dockerfile.ubi7.mysql57 | 2 +- docker/lite/Dockerfile.ubi7.mysql80 | 2 +- docker/lite/Dockerfile.ubi7.percona57 | 2 +- docker/lite/Dockerfile.ubi7.percona80 | 2 +- docker/lite/Dockerfile.ubi8.arm64.mysql80 | 2 +- docker/lite/Dockerfile.ubi8.mysql80 | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker/lite/Dockerfile.mysql57 b/docker/lite/Dockerfile.mysql57 index 83d6dd205ed..3f22dac5070 100644 --- a/docker/lite/Dockerfile.mysql57 +++ b/docker/lite/Dockerfile.mysql57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.mysql80 b/docker/lite/Dockerfile.mysql80 index 022de0fb39a..932f90a93a6 100644 --- a/docker/lite/Dockerfile.mysql80 +++ b/docker/lite/Dockerfile.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.percona57 b/docker/lite/Dockerfile.percona57 index 6c18a75893c..febb94e3519 100644 --- a/docker/lite/Dockerfile.percona57 +++ b/docker/lite/Dockerfile.percona57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-percona57" +ARG image="frouioui/bootstrap:${bootstrap_version}-percona57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.percona80 b/docker/lite/Dockerfile.percona80 index f6a47fe8c91..ea633765846 100644 --- a/docker/lite/Dockerfile.percona80 +++ b/docker/lite/Dockerfile.percona80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-percona80" +ARG image="frouioui/bootstrap:${bootstrap_version}-percona80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.testing b/docker/lite/Dockerfile.testing index 263743af7b5..00dfca0026c 100644 --- a/docker/lite/Dockerfile.testing +++ b/docker/lite/Dockerfile.testing @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.mysql57 b/docker/lite/Dockerfile.ubi7.mysql57 index f3b64cda07b..73864a1dee7 100644 --- a/docker/lite/Dockerfile.ubi7.mysql57 +++ b/docker/lite/Dockerfile.ubi7.mysql57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.mysql80 b/docker/lite/Dockerfile.ubi7.mysql80 index ed6d063c88d..618c19d14a7 100644 --- a/docker/lite/Dockerfile.ubi7.mysql80 +++ b/docker/lite/Dockerfile.ubi7.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.percona57 b/docker/lite/Dockerfile.ubi7.percona57 index 435e985cb45..a833c559876 100644 --- a/docker/lite/Dockerfile.ubi7.percona57 +++ b/docker/lite/Dockerfile.ubi7.percona57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-percona57" +ARG image="frouioui/bootstrap:${bootstrap_version}-percona57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.percona80 b/docker/lite/Dockerfile.ubi7.percona80 index 4cc4941584a..5d9a33fdbe6 100644 --- a/docker/lite/Dockerfile.ubi7.percona80 +++ b/docker/lite/Dockerfile.ubi7.percona80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-percona80" +ARG image="frouioui/bootstrap:${bootstrap_version}-percona80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi8.arm64.mysql80 b/docker/lite/Dockerfile.ubi8.arm64.mysql80 index ba2c8db7b60..f348d636b3c 100644 --- a/docker/lite/Dockerfile.ubi8.arm64.mysql80 +++ b/docker/lite/Dockerfile.ubi8.arm64.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi8.mysql80 b/docker/lite/Dockerfile.ubi8.mysql80 index 9db13e3e301..d99144a25e9 100644 --- a/docker/lite/Dockerfile.ubi8.mysql80 +++ b/docker/lite/Dockerfile.ubi8.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder From 34338ef3991bb4b15000ff4afb9dbabcf911613b Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 3 Aug 2023 18:41:54 +0200 Subject: [PATCH 38/53] rpm import new gpg key for mysql Signed-off-by: Florent Poinsard --- docker/lite/Dockerfile.ubi7.mysql57 | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/lite/Dockerfile.ubi7.mysql57 b/docker/lite/Dockerfile.ubi7.mysql57 index 73864a1dee7..584dba13c0d 100644 --- a/docker/lite/Dockerfile.ubi7.mysql57 +++ b/docker/lite/Dockerfile.ubi7.mysql57 @@ -36,6 +36,7 @@ RUN make install PREFIX=/vt/install FROM registry.access.redhat.com/ubi7/ubi:latest # Install keys and dependencies +RUN rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022 RUN mkdir /tmp/gpg && chmod 700 /tmp/gpg && export GNUPGHOME=/tmp/gpg \ && yum install -y --setopt=alwaysprompt=no gnupg \ && ( gpg --keyserver keyserver.ubuntu.com --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 4D1BB29D63D98E422B2113B19334A25F8507EFA5 6341AB2753D78A78A7C27BB124C6A8A7F4A80EB5 A4A9406876FCBD3C456770C88C718D3B5072E1F5 ) \ From 87ac8a7be07e817dfdf3870d522e561d07b281cf Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 7 Aug 2023 16:20:31 +0200 Subject: [PATCH 39/53] add proper gpg key to all ubi images Signed-off-by: Florent Poinsard --- docker/lite/Dockerfile.ubi7.mysql80 | 1 + docker/lite/Dockerfile.ubi8.arm64.mysql80 | 1 + docker/lite/Dockerfile.ubi8.mysql80 | 1 + 3 files changed, 3 insertions(+) diff --git a/docker/lite/Dockerfile.ubi7.mysql80 b/docker/lite/Dockerfile.ubi7.mysql80 index 618c19d14a7..547586a5ae1 100644 --- a/docker/lite/Dockerfile.ubi7.mysql80 +++ b/docker/lite/Dockerfile.ubi7.mysql80 @@ -36,6 +36,7 @@ RUN make install PREFIX=/vt/install FROM registry.access.redhat.com/ubi7/ubi:latest # Install keys and dependencies +RUN rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022 RUN mkdir /tmp/gpg && chmod 700 /tmp/gpg && export GNUPGHOME=/tmp/gpg \ && yum install -y --setopt=alwaysprompt=no gnupg \ && ( gpg --keyserver keyserver.ubuntu.com --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 4D1BB29D63D98E422B2113B19334A25F8507EFA5 6341AB2753D78A78A7C27BB124C6A8A7F4A80EB5 A4A9406876FCBD3C456770C88C718D3B5072E1F5 ) \ diff --git a/docker/lite/Dockerfile.ubi8.arm64.mysql80 b/docker/lite/Dockerfile.ubi8.arm64.mysql80 index f348d636b3c..987511c13e7 100644 --- a/docker/lite/Dockerfile.ubi8.arm64.mysql80 +++ b/docker/lite/Dockerfile.ubi8.arm64.mysql80 @@ -36,6 +36,7 @@ RUN make cross-install PREFIX=/vt/install GOOS=linux GOARCH=arm64 FROM registry.access.redhat.com/ubi8/ubi:latest # Install keys and dependencies +RUN rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022 RUN mkdir /tmp/gpg && chmod 700 /tmp/gpg && export GNUPGHOME=/tmp/gpg \ && yum install -y --setopt=alwaysprompt=no gnupg \ && ( gpg --keyserver keyserver.ubuntu.com --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 3A79BD29 A4A9406876FCBD3C456770C88C718D3B5072E1F5 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 ) \ diff --git a/docker/lite/Dockerfile.ubi8.mysql80 b/docker/lite/Dockerfile.ubi8.mysql80 index d99144a25e9..ed88ec89c34 100644 --- a/docker/lite/Dockerfile.ubi8.mysql80 +++ b/docker/lite/Dockerfile.ubi8.mysql80 @@ -36,6 +36,7 @@ RUN make install PREFIX=/vt/install FROM registry.access.redhat.com/ubi8/ubi:latest # Install keys and dependencies +RUN rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022 RUN mkdir /tmp/gpg && chmod 700 /tmp/gpg && export GNUPGHOME=/tmp/gpg \ && yum install -y --setopt=alwaysprompt=no gnupg \ && ( gpg --keyserver keyserver.ubuntu.com --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 3A79BD29 A4A9406876FCBD3C456770C88C718D3B5072E1F5 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 ) \ From abea9905d1cbb4551633b2e6d6bd267df03f122c Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 7 Aug 2023 20:57:49 +0200 Subject: [PATCH 40/53] add docker_lite_push utility Signed-off-by: Florent Poinsard --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index df0047b5714..813dc3339e2 100644 --- a/Makefile +++ b/Makefile @@ -327,6 +327,9 @@ DOCKER_LITE_TARGETS = $(addprefix docker_lite_,$(DOCKER_LITE_SUFFIX)) $(DOCKER_LITE_TARGETS): docker_lite_%: ${call build_docker_image,docker/lite/Dockerfile.$*,frouioui/lite:$*} +docker_lite_push: + for i in $(DOCKER_LITE_SUFFIX); do echo "pushing lite image: $$i"; docker push frouioui/lite:$$i || exit 1; done + docker_lite_all: docker_lite $(DOCKER_LITE_TARGETS) docker_local: From fabe6ecc168ed68ca297137345e80b5d38e4bd79 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 7 Aug 2023 21:10:11 +0200 Subject: [PATCH 41/53] use proper image for operator examples Signed-off-by: Florent Poinsard --- examples/operator/101_initial_cluster.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 90eeda97fb2..be1441d1a8d 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -8,14 +8,14 @@ metadata: name: example spec: images: - vtctld: frouioui/lite:mysql57 + vtctld: frouioui/lite:mysql80 vtadmin: vitess/vtadmin:v17.0.1 - vtgate: frouioui/lite:mysql57 - vttablet: frouioui/lite:mysql57 - vtbackup: frouioui/lite:mysql57 - vtorc: frouioui/lite:mysql57 + vtgate: frouioui/lite:mysql80 + vttablet: frouioui/lite:mysql80 + vtbackup: frouioui/lite:mysql80 + vtorc: frouioui/lite:mysql80 mysqld: - mysql56Compatible: frouioui/lite:mysql57 + mysql56Compatible: frouioui/lite:mysql80 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 From 8659c3b10a95b573544adfc23e58e83adfeaf555 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 7 Aug 2023 21:18:03 +0200 Subject: [PATCH 42/53] test with 57 Signed-off-by: Florent Poinsard --- examples/operator/101_initial_cluster.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index be1441d1a8d..e0319800365 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -8,14 +8,14 @@ metadata: name: example spec: images: - vtctld: frouioui/lite:mysql80 + vtctld: frouioui/lite:mysql57 vtadmin: vitess/vtadmin:v17.0.1 - vtgate: frouioui/lite:mysql80 - vttablet: frouioui/lite:mysql80 - vtbackup: frouioui/lite:mysql80 - vtorc: frouioui/lite:mysql80 + vtgate: frouioui/lite:mysql57 + vttablet: frouioui/lite:mysql57 + vtbackup: frouioui/lite:mysql57 + vtorc: frouioui/lite:mysql57 mysqld: - mysql56Compatible: frouioui/lite:mysql80 + mysql80Compatible: frouioui/lite:mysql57 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 From 61271d4421cff5e53ee5390669a7264679c89700 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 7 Aug 2023 21:24:33 +0200 Subject: [PATCH 43/53] revert debug changes Signed-off-by: Florent Poinsard --- Makefile | 8 ++++---- docker/bootstrap/build.sh | 4 ++-- docker/lite/Dockerfile.mysql57 | 2 +- docker/lite/Dockerfile.mysql80 | 2 +- docker/lite/Dockerfile.percona57 | 2 +- docker/lite/Dockerfile.percona80 | 2 +- docker/lite/Dockerfile.testing | 2 +- docker/lite/Dockerfile.ubi7.mysql57 | 2 +- docker/lite/Dockerfile.ubi7.mysql80 | 2 +- docker/lite/Dockerfile.ubi7.percona57 | 2 +- docker/lite/Dockerfile.ubi7.percona80 | 2 +- docker/lite/Dockerfile.ubi8.arm64.mysql80 | 2 +- docker/lite/Dockerfile.ubi8.mysql80 | 2 +- examples/operator/101_initial_cluster.yaml | 14 +++++++------- examples/operator/201_customer_tablets.yaml | 12 ++++++------ examples/operator/302_new_shards.yaml | 12 ++++++------ examples/operator/306_down_shard_0.yaml | 12 ++++++------ examples/operator/README.md | 12 ++++++------ 18 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Makefile b/Makefile index 813dc3339e2..1773d203949 100644 --- a/Makefile +++ b/Makefile @@ -285,7 +285,7 @@ docker_bootstrap_test: flavors='$(DOCKER_IMAGES_FOR_TEST)' && ./test.go -pull=false -parallel=2 -bootstrap-version=${BOOTSTRAP_VERSION} -flavor=$${flavors// /,} docker_bootstrap_push: - for i in $(DOCKER_IMAGES); do echo "pushing bootstrap image: ${BOOTSTRAP_VERSION}-$$i"; docker push frouioui/bootstrap:${BOOTSTRAP_VERSION}-$$i || exit 1; done + for i in $(DOCKER_IMAGES); do echo "pushing bootstrap image: ${BOOTSTRAP_VERSION}-$$i"; docker push vitess/bootstrap:${BOOTSTRAP_VERSION}-$$i || exit 1; done # Use this target to update the local copy of your images with the one on Dockerhub. docker_bootstrap_pull: @@ -320,15 +320,15 @@ $(DOCKER_BASE_TARGETS): docker_base_%: docker_base_all: docker_base $(DOCKER_BASE_TARGETS) docker_lite: - ${call build_docker_image,docker/lite/Dockerfile,frouioui/lite} + ${call build_docker_image,docker/lite/Dockerfile,vitess/lite} 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.$*,frouioui/lite:$*} + ${call build_docker_image,docker/lite/Dockerfile.$*,vitess/lite:$*} docker_lite_push: - for i in $(DOCKER_LITE_SUFFIX); do echo "pushing lite image: $$i"; docker push frouioui/lite:$$i || exit 1; done + for i in $(DOCKER_LITE_SUFFIX); do echo "pushing lite image: $$i"; docker push vitess/lite:$$i || exit 1; done docker_lite_all: docker_lite $(DOCKER_LITE_TARGETS) diff --git a/docker/bootstrap/build.sh b/docker/bootstrap/build.sh index 9a2acce8485..8cc6a151606 100755 --- a/docker/bootstrap/build.sh +++ b/docker/bootstrap/build.sh @@ -48,8 +48,8 @@ chmod -R o=rx *; arch=$(uname -m) -base_image="${base_image:-frouioui/bootstrap:$version-common}" -image="${image:-frouioui/bootstrap:$version-$flavor}" +base_image="${base_image:-vitess/bootstrap:$version-common}" +image="${image:-vitess/bootstrap:$version-$flavor}" while [ $# -gt 0 ]; do if [[ $1 == *"--"* ]]; then diff --git a/docker/lite/Dockerfile.mysql57 b/docker/lite/Dockerfile.mysql57 index 3f22dac5070..83d6dd205ed 100644 --- a/docker/lite/Dockerfile.mysql57 +++ b/docker/lite/Dockerfile.mysql57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql57" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.mysql80 b/docker/lite/Dockerfile.mysql80 index 932f90a93a6..022de0fb39a 100644 --- a/docker/lite/Dockerfile.mysql80 +++ b/docker/lite/Dockerfile.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.percona57 b/docker/lite/Dockerfile.percona57 index febb94e3519..6c18a75893c 100644 --- a/docker/lite/Dockerfile.percona57 +++ b/docker/lite/Dockerfile.percona57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-percona57" +ARG image="vitess/bootstrap:${bootstrap_version}-percona57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.percona80 b/docker/lite/Dockerfile.percona80 index ea633765846..f6a47fe8c91 100644 --- a/docker/lite/Dockerfile.percona80 +++ b/docker/lite/Dockerfile.percona80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-percona80" +ARG image="vitess/bootstrap:${bootstrap_version}-percona80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.testing b/docker/lite/Dockerfile.testing index 00dfca0026c..263743af7b5 100644 --- a/docker/lite/Dockerfile.testing +++ b/docker/lite/Dockerfile.testing @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql57" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.mysql57 b/docker/lite/Dockerfile.ubi7.mysql57 index 584dba13c0d..dd5dec08730 100644 --- a/docker/lite/Dockerfile.ubi7.mysql57 +++ b/docker/lite/Dockerfile.ubi7.mysql57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql57" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.mysql80 b/docker/lite/Dockerfile.ubi7.mysql80 index 547586a5ae1..2e84ddd7000 100644 --- a/docker/lite/Dockerfile.ubi7.mysql80 +++ b/docker/lite/Dockerfile.ubi7.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.percona57 b/docker/lite/Dockerfile.ubi7.percona57 index a833c559876..435e985cb45 100644 --- a/docker/lite/Dockerfile.ubi7.percona57 +++ b/docker/lite/Dockerfile.ubi7.percona57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-percona57" +ARG image="vitess/bootstrap:${bootstrap_version}-percona57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.percona80 b/docker/lite/Dockerfile.ubi7.percona80 index 5d9a33fdbe6..4cc4941584a 100644 --- a/docker/lite/Dockerfile.ubi7.percona80 +++ b/docker/lite/Dockerfile.ubi7.percona80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-percona80" +ARG image="vitess/bootstrap:${bootstrap_version}-percona80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi8.arm64.mysql80 b/docker/lite/Dockerfile.ubi8.arm64.mysql80 index 987511c13e7..1f06a3a4b38 100644 --- a/docker/lite/Dockerfile.ubi8.arm64.mysql80 +++ b/docker/lite/Dockerfile.ubi8.arm64.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi8.mysql80 b/docker/lite/Dockerfile.ubi8.mysql80 index ed88ec89c34..a30cbff5f23 100644 --- a/docker/lite/Dockerfile.ubi8.mysql80 +++ b/docker/lite/Dockerfile.ubi8.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index e0319800365..53acf0a7b8c 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -8,14 +8,14 @@ metadata: name: example spec: images: - vtctld: frouioui/lite:mysql57 - vtadmin: vitess/vtadmin:v17.0.1 - vtgate: frouioui/lite:mysql57 - vttablet: frouioui/lite:mysql57 - vtbackup: frouioui/lite:mysql57 - vtorc: frouioui/lite:mysql57 + vtctld: vitess/lite:latest + vtadmin: vitess/vtadmin:latest + vtgate: vitess/lite:latest + vttablet: vitess/lite:latest + vtbackup: vitess/lite:latest + vtorc: vitess/lite:latest mysqld: - mysql80Compatible: frouioui/lite:mysql57 + mysql56Compatible: vitess/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/201_customer_tablets.yaml b/examples/operator/201_customer_tablets.yaml index 0fc232959bb..144754a00fe 100644 --- a/examples/operator/201_customer_tablets.yaml +++ b/examples/operator/201_customer_tablets.yaml @@ -4,14 +4,14 @@ metadata: name: example spec: images: - vtctld: frouioui/lite:latest + vtctld: vitess/lite:latest vtadmin: vitess/vtadmin:v17.0.1-bullseye - vtgate: frouioui/lite:latest - vttablet: frouioui/lite:latest - vtbackup: frouioui/lite:latest - vtorc: frouioui/lite:latest + vtgate: vitess/lite:latest + vttablet: vitess/lite:latest + vtbackup: vitess/lite:latest + vtorc: vitess/lite:latest mysqld: - mysql80Compatible: frouioui/lite:latest + mysql80Compatible: vitess/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/302_new_shards.yaml b/examples/operator/302_new_shards.yaml index d021f075929..533d80121a4 100644 --- a/examples/operator/302_new_shards.yaml +++ b/examples/operator/302_new_shards.yaml @@ -4,14 +4,14 @@ metadata: name: example spec: images: - vtctld: frouioui/lite:latest + vtctld: vitess/lite:latest vtadmin: vitess/vtadmin:v17.0.1-bullseye - vtgate: frouioui/lite:latest - vttablet: frouioui/lite:latest - vtbackup: frouioui/lite:latest - vtorc: frouioui/lite:latest + vtgate: vitess/lite:latest + vttablet: vitess/lite:latest + vtbackup: vitess/lite:latest + vtorc: vitess/lite:latest mysqld: - mysql80Compatible: frouioui/lite:latest + mysql80Compatible: vitess/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/306_down_shard_0.yaml b/examples/operator/306_down_shard_0.yaml index 6716f53560e..2f0db76c271 100644 --- a/examples/operator/306_down_shard_0.yaml +++ b/examples/operator/306_down_shard_0.yaml @@ -4,14 +4,14 @@ metadata: name: example spec: images: - vtctld: frouioui/lite:latest + vtctld: vitess/lite:latest vtadmin: vitess/vtadmin:v17.0.1-bullseye - vtgate: frouioui/lite:latest - vttablet: frouioui/lite:latest - vtbackup: frouioui/lite:latest - vtorc: frouioui/lite:latest + vtgate: vitess/lite:latest + vttablet: vitess/lite:latest + vtbackup: vitess/lite:latest + vtorc: vitess/lite:latest mysqld: - mysql80Compatible: frouioui/lite:latest + mysql80Compatible: vitess/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/README.md b/examples/operator/README.md index ca7622c8eff..c966be0e3ab 100644 --- a/examples/operator/README.md +++ b/examples/operator/README.md @@ -11,14 +11,14 @@ kubectl apply -f operator.yaml # NOTE: If you are using MySQL 8, update the images section to use mysql80 images # Example: # images: -# vtctld: frouioui/lite:mysql80 +# vtctld: vitess/lite:mysql80 # vtadmin: vitess/vtadmin:v17.0.1-bullseye -# vtgate: frouioui/lite:mysql80 -# vttablet: frouioui/lite:mysql80 -# vtbackup: frouioui/lite:mysql80 -# vtorc: frouioui/lite:mysql80 +# vtgate: vitess/lite:mysql80 +# vttablet: vitess/lite:mysql80 +# vtbackup: vitess/lite:mysql80 +# vtorc: vitess/lite:mysql80 # mysqld: -# mysql80Compatible: frouioui/lite:mysql80 +# mysql80Compatible: vitess/lite:mysql80 kubectl apply -f 101_initial_cluster.yaml From 9a444b2711a33a3398168211fdbaae85c8086f4d Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 7 Aug 2023 21:27:39 +0200 Subject: [PATCH 44/53] revert more debug changes in the examples Signed-off-by: Florent Poinsard --- examples/operator/101_initial_cluster.yaml | 2 +- examples/operator/201_customer_tablets.yaml | 2 +- examples/operator/302_new_shards.yaml | 2 +- examples/operator/306_down_shard_0.yaml | 2 +- examples/operator/README.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 53acf0a7b8c..22cdc6f686d 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -15,7 +15,7 @@ spec: vtbackup: vitess/lite:latest vtorc: vitess/lite:latest mysqld: - mysql56Compatible: vitess/lite:latest + mysql80Compatible: vitess/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/201_customer_tablets.yaml b/examples/operator/201_customer_tablets.yaml index 144754a00fe..5800a5e05df 100644 --- a/examples/operator/201_customer_tablets.yaml +++ b/examples/operator/201_customer_tablets.yaml @@ -5,7 +5,7 @@ metadata: spec: images: vtctld: vitess/lite:latest - vtadmin: vitess/vtadmin:v17.0.1-bullseye + vtadmin: vitess/vtadmin:latest vtgate: vitess/lite:latest vttablet: vitess/lite:latest vtbackup: vitess/lite:latest diff --git a/examples/operator/302_new_shards.yaml b/examples/operator/302_new_shards.yaml index 533d80121a4..2e15bc40d28 100644 --- a/examples/operator/302_new_shards.yaml +++ b/examples/operator/302_new_shards.yaml @@ -5,7 +5,7 @@ metadata: spec: images: vtctld: vitess/lite:latest - vtadmin: vitess/vtadmin:v17.0.1-bullseye + vtadmin: vitess/vtadmin:latest vtgate: vitess/lite:latest vttablet: vitess/lite:latest vtbackup: vitess/lite:latest diff --git a/examples/operator/306_down_shard_0.yaml b/examples/operator/306_down_shard_0.yaml index 2f0db76c271..4bdb694d678 100644 --- a/examples/operator/306_down_shard_0.yaml +++ b/examples/operator/306_down_shard_0.yaml @@ -5,7 +5,7 @@ metadata: spec: images: vtctld: vitess/lite:latest - vtadmin: vitess/vtadmin:v17.0.1-bullseye + vtadmin: vitess/vtadmin:latest vtgate: vitess/lite:latest vttablet: vitess/lite:latest vtbackup: vitess/lite:latest diff --git a/examples/operator/README.md b/examples/operator/README.md index c966be0e3ab..de2e598b516 100644 --- a/examples/operator/README.md +++ b/examples/operator/README.md @@ -12,7 +12,7 @@ kubectl apply -f operator.yaml # Example: # images: # vtctld: vitess/lite:mysql80 -# vtadmin: vitess/vtadmin:v17.0.1-bullseye +# vtadmin: vitess/vtadmin:latest # vtgate: vitess/lite:mysql80 # vttablet: vitess/lite:mysql80 # vtbackup: vitess/lite:mysql80 From 5c2e399f031f0bcd3d84c4175726e28b08c933fb Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 7 Aug 2023 21:38:05 +0200 Subject: [PATCH 45/53] update the release notes Signed-off-by: Florent Poinsard --- changelog/18.0/18.0.0/summary.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/changelog/18.0/18.0.0/summary.md b/changelog/18.0/18.0.0/summary.md index e0001324c26..c8a24e99170 100644 --- a/changelog/18.0/18.0.0/summary.md +++ b/changelog/18.0/18.0.0/summary.md @@ -112,4 +112,10 @@ Bullseye images will still be built and available as long as the OS build is cur Buster LTS supports will stop in June 2024, and Vitess v18.0 will be supported through October 2024. To prevent supporting a deprecated buster build for several months after June 2024, we are preemptively -removing Vitess support. +removing Vitess support for MySQL 80 and Percona Docker images. + +The `vitess/bootstrap:mysql57` and `vitess/lite:mysql57` images are still available but will be built on Buster +since MySQL 57 is not available on Bullseye and earlier versions of Debian. The Golang version used for those +image will remain on `go1.20.5` as Golang does not provide a Buster image for `go1.20.6` and more recent Go versions. +All other images will be built on Bullseye and/or Bookworm as explained in the [Bookworm added and made default](#debian-bookworm) section, +and will continue to use the latest available Golang `go1.20` patch. \ No newline at end of file From 8d051b662ffb8806876fb6d6f20bff5f6be03fc6 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 7 Aug 2023 21:54:42 +0200 Subject: [PATCH 46/53] update bootstrap version in test.go too Signed-off-by: Florent Poinsard --- test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.go b/test.go index a5f8e3b89ce..3955220842d 100755 --- a/test.go +++ b/test.go @@ -77,7 +77,7 @@ For example: // Flags var ( flavor = flag.String("flavor", "mysql57", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors) - bootstrapVersion = flag.String("bootstrap-version", "19", "the version identifier to use for the docker images") + bootstrapVersion = flag.String("bootstrap-version", "20", "the version identifier to use for the docker images") runCount = flag.Int("runs", 1, "run each test this many times") retryMax = flag.Int("retry", 3, "max number of retries, to detect flaky tests") logPass = flag.Bool("log-pass", false, "log test output even if it passes") From 5d0b77b20cbb721859c57250286cdf2d057d3526 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 8 Aug 2023 15:24:21 +0200 Subject: [PATCH 47/53] upgrade mysql57 to bullseye while keeping the buster package installation Signed-off-by: Florent Poinsard --- Makefile | 2 +- docker/bootstrap/Dockerfile.common-mysql57 | 50 ---------------------- docker/bootstrap/Dockerfile.mysql57 | 2 +- docker/lite/Dockerfile.mysql57 | 2 +- 4 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 docker/bootstrap/Dockerfile.common-mysql57 diff --git a/Makefile b/Makefile index 1773d203949..3af32a1d7b3 100644 --- a/Makefile +++ b/Makefile @@ -272,7 +272,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto # This rule builds the bootstrap images for all flavors. DOCKER_IMAGES_FOR_TEST = mysql57 mysql80 percona57 percona80 -DOCKER_IMAGES = common common-mysql57 $(DOCKER_IMAGES_FOR_TEST) +DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST) BOOTSTRAP_VERSION=20 ensure_bootstrap_version: find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \; diff --git a/docker/bootstrap/Dockerfile.common-mysql57 b/docker/bootstrap/Dockerfile.common-mysql57 deleted file mode 100644 index 3f8e7d68a59..00000000000 --- a/docker/bootstrap/Dockerfile.common-mysql57 +++ /dev/null @@ -1,50 +0,0 @@ -FROM --platform=linux/amd64 golang:1.20.5-buster - -# Install Vitess build dependencies -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - # TODO(mberlin): Group these to make it easier to understand which library actually requires them. - ant \ - chromium \ - curl \ - default-jdk \ - etcd \ - g++ \ - git \ - make \ - maven \ - software-properties-common \ - unzip \ - zip \ - xvfb \ - && rm -rf /var/lib/apt/lists/* - -# Set up Vitess environment (equivalent to '. dev.env') -ENV VTROOT /vt/src/vitess.io/vitess -ENV VTDATAROOT /vt/vtdataroot -ENV VTPORTSTART 15000 -ENV PATH $VTROOT/bin:$VTROOT/dist/maven/bin:$PATH -ENV USER vitess - -# Copy files needed for bootstrap -COPY bootstrap.sh dev.env build.env go.mod go.sum /vt/src/vitess.io/vitess/ -COPY config /vt/src/vitess.io/vitess/config -COPY tools /vt/src/vitess.io/vitess/tools - -# Create vitess user -RUN groupadd -r vitess && useradd -r -g vitess vitess && \ - mkdir -p /vt/vtdataroot /home/vitess && \ - chown -R vitess:vitess /vt /home/vitess - -# Download vendored Go dependencies -RUN cd /vt/src/vitess.io/vitess && \ - su vitess -c "/usr/local/go/bin/go mod download" - -# Create mount point for actual data (e.g. MySQL data dir) -VOLUME /vt/vtdataroot - -# The docker lite images copy from the builder in /vt/bin -# Add compatibility to the previous layout for now -RUN su vitess -c "mkdir -p /vt/src/vitess.io/vitess/bin && rm -rf /vt/bin && ln -s /vt/src/vitess.io/vitess/bin /vt/bin" - -# If the user doesn't specify a command, load a shell. -CMD ["/bin/bash"] diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 793eaa11222..4e9b335ddac 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -1,5 +1,5 @@ ARG bootstrap_version -ARG image="vitess/bootstrap:${bootstrap_version}-common-mysql57" +ARG image="vitess/bootstrap:${bootstrap_version}-common" FROM --platform=linux/amd64 "${image}" diff --git a/docker/lite/Dockerfile.mysql57 b/docker/lite/Dockerfile.mysql57 index 83d6dd205ed..8244c4b1bd1 100644 --- a/docker/lite/Dockerfile.mysql57 +++ b/docker/lite/Dockerfile.mysql57 @@ -33,7 +33,7 @@ USER vitess RUN make install PREFIX=/vt/install # Start over and build the final image. -FROM debian:buster-slim +FROM debian:bullseye-slim # Install dependencies COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh From 1db56f6ccfe833dc973f856c779a352a21c1679a Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 8 Aug 2023 15:29:10 +0200 Subject: [PATCH 48/53] [debug] push and use frouioui images Signed-off-by: Florent Poinsard --- Makefile | 2 +- docker/bootstrap/Dockerfile.mysql57 | 2 +- docker/bootstrap/Dockerfile.mysql80 | 2 +- docker/bootstrap/Dockerfile.percona57 | 2 +- docker/bootstrap/Dockerfile.percona80 | 2 +- docker/lite/Dockerfile.mysql57 | 2 +- docker/lite/Dockerfile.mysql80 | 2 +- docker/lite/Dockerfile.percona57 | 2 +- docker/lite/Dockerfile.percona80 | 2 +- docker/lite/Dockerfile.ubi7.mysql57 | 2 +- docker/lite/Dockerfile.ubi7.mysql80 | 2 +- docker/lite/Dockerfile.ubi7.percona57 | 2 +- docker/lite/Dockerfile.ubi7.percona80 | 2 +- docker/lite/Dockerfile.ubi8.arm64.mysql80 | 2 +- docker/lite/Dockerfile.ubi8.mysql80 | 2 +- examples/operator/101_initial_cluster.yaml | 12 ++++++------ 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 3af32a1d7b3..8073fe9b1bc 100644 --- a/Makefile +++ b/Makefile @@ -285,7 +285,7 @@ docker_bootstrap_test: flavors='$(DOCKER_IMAGES_FOR_TEST)' && ./test.go -pull=false -parallel=2 -bootstrap-version=${BOOTSTRAP_VERSION} -flavor=$${flavors// /,} docker_bootstrap_push: - for i in $(DOCKER_IMAGES); do echo "pushing bootstrap image: ${BOOTSTRAP_VERSION}-$$i"; docker push vitess/bootstrap:${BOOTSTRAP_VERSION}-$$i || exit 1; done + for i in $(DOCKER_IMAGES); do echo "pushing bootstrap image: ${BOOTSTRAP_VERSION}-$$i"; docker push frouioui/bootstrap:${BOOTSTRAP_VERSION}-$$i || exit 1; done # Use this target to update the local copy of your images with the one on Dockerhub. docker_bootstrap_pull: diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 4e9b335ddac..4e563bb4f71 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -1,5 +1,5 @@ ARG bootstrap_version -ARG image="vitess/bootstrap:${bootstrap_version}-common" +ARG image="frouioui/bootstrap:${bootstrap_version}-common" FROM --platform=linux/amd64 "${image}" diff --git a/docker/bootstrap/Dockerfile.mysql80 b/docker/bootstrap/Dockerfile.mysql80 index 059f01b8101..00d256dfdca 100644 --- a/docker/bootstrap/Dockerfile.mysql80 +++ b/docker/bootstrap/Dockerfile.mysql80 @@ -1,5 +1,5 @@ ARG bootstrap_version -ARG image="vitess/bootstrap:${bootstrap_version}-common" +ARG image="frouioui/bootstrap:${bootstrap_version}-common" FROM --platform=linux/amd64 "${image}" diff --git a/docker/bootstrap/Dockerfile.percona57 b/docker/bootstrap/Dockerfile.percona57 index febe09fd8bf..e9e008fd95a 100644 --- a/docker/bootstrap/Dockerfile.percona57 +++ b/docker/bootstrap/Dockerfile.percona57 @@ -1,5 +1,5 @@ ARG bootstrap_version -ARG image="vitess/bootstrap:${bootstrap_version}-common" +ARG image="frouioui/bootstrap:${bootstrap_version}-common" FROM --platform=linux/amd64 "${image}" diff --git a/docker/bootstrap/Dockerfile.percona80 b/docker/bootstrap/Dockerfile.percona80 index 446ec554612..c3309acf473 100644 --- a/docker/bootstrap/Dockerfile.percona80 +++ b/docker/bootstrap/Dockerfile.percona80 @@ -1,5 +1,5 @@ ARG bootstrap_version -ARG image="vitess/bootstrap:${bootstrap_version}-common" +ARG image="frouioui/bootstrap:${bootstrap_version}-common" FROM --platform=linux/amd64 "${image}" diff --git a/docker/lite/Dockerfile.mysql57 b/docker/lite/Dockerfile.mysql57 index 8244c4b1bd1..0a2a70b9afe 100644 --- a/docker/lite/Dockerfile.mysql57 +++ b/docker/lite/Dockerfile.mysql57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.mysql80 b/docker/lite/Dockerfile.mysql80 index 022de0fb39a..932f90a93a6 100644 --- a/docker/lite/Dockerfile.mysql80 +++ b/docker/lite/Dockerfile.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.percona57 b/docker/lite/Dockerfile.percona57 index 6c18a75893c..febb94e3519 100644 --- a/docker/lite/Dockerfile.percona57 +++ b/docker/lite/Dockerfile.percona57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-percona57" +ARG image="frouioui/bootstrap:${bootstrap_version}-percona57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.percona80 b/docker/lite/Dockerfile.percona80 index f6a47fe8c91..ea633765846 100644 --- a/docker/lite/Dockerfile.percona80 +++ b/docker/lite/Dockerfile.percona80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-percona80" +ARG image="frouioui/bootstrap:${bootstrap_version}-percona80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.mysql57 b/docker/lite/Dockerfile.ubi7.mysql57 index dd5dec08730..584dba13c0d 100644 --- a/docker/lite/Dockerfile.ubi7.mysql57 +++ b/docker/lite/Dockerfile.ubi7.mysql57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.mysql80 b/docker/lite/Dockerfile.ubi7.mysql80 index 2e84ddd7000..547586a5ae1 100644 --- a/docker/lite/Dockerfile.ubi7.mysql80 +++ b/docker/lite/Dockerfile.ubi7.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.percona57 b/docker/lite/Dockerfile.ubi7.percona57 index 435e985cb45..a833c559876 100644 --- a/docker/lite/Dockerfile.ubi7.percona57 +++ b/docker/lite/Dockerfile.ubi7.percona57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-percona57" +ARG image="frouioui/bootstrap:${bootstrap_version}-percona57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.percona80 b/docker/lite/Dockerfile.ubi7.percona80 index 4cc4941584a..5d9a33fdbe6 100644 --- a/docker/lite/Dockerfile.ubi7.percona80 +++ b/docker/lite/Dockerfile.ubi7.percona80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-percona80" +ARG image="frouioui/bootstrap:${bootstrap_version}-percona80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi8.arm64.mysql80 b/docker/lite/Dockerfile.ubi8.arm64.mysql80 index 1f06a3a4b38..987511c13e7 100644 --- a/docker/lite/Dockerfile.ubi8.arm64.mysql80 +++ b/docker/lite/Dockerfile.ubi8.arm64.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi8.mysql80 b/docker/lite/Dockerfile.ubi8.mysql80 index a30cbff5f23..ed88ec89c34 100644 --- a/docker/lite/Dockerfile.ubi8.mysql80 +++ b/docker/lite/Dockerfile.ubi8.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" +ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 22cdc6f686d..447bb43e762 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -8,14 +8,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest + vtctld: frouioui/lite:mysql57 vtadmin: vitess/vtadmin:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtbackup: vitess/lite:latest - vtorc: vitess/lite:latest + vtgate: frouioui/lite:mysql57 + vttablet: frouioui/lite:mysql57 + vtbackup: frouioui/lite:mysql57 + vtorc: frouioui/lite:mysql57 mysqld: - mysql80Compatible: vitess/lite:latest + mysql56Compatible: frouioui/lite:mysql57 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 From a3d0544fd4e3fe740fab0eed0d506c1749a5ff5c Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 8 Aug 2023 15:33:22 +0200 Subject: [PATCH 49/53] use bullseye for mysql57 on vttestserver Signed-off-by: Florent Poinsard --- docker/vttestserver/Dockerfile.mysql57 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/vttestserver/Dockerfile.mysql57 b/docker/vttestserver/Dockerfile.mysql57 index c2705fddacd..546c4794378 100644 --- a/docker/vttestserver/Dockerfile.mysql57 +++ b/docker/vttestserver/Dockerfile.mysql57 @@ -33,7 +33,7 @@ USER vitess RUN make install-testing PREFIX=/vt/install # Start over and build the final image. -FROM debian:buster-slim +FROM debian:bullseye-slim # Install dependencies COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh From 3c5dc9a6407186981ea3cc439a17fb77c42e52b4 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 8 Aug 2023 15:44:03 +0200 Subject: [PATCH 50/53] use frouioui in bootstrap docker build Signed-off-by: Florent Poinsard --- docker/bootstrap/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/bootstrap/build.sh b/docker/bootstrap/build.sh index 8cc6a151606..9a2acce8485 100755 --- a/docker/bootstrap/build.sh +++ b/docker/bootstrap/build.sh @@ -48,8 +48,8 @@ chmod -R o=rx *; arch=$(uname -m) -base_image="${base_image:-vitess/bootstrap:$version-common}" -image="${image:-vitess/bootstrap:$version-$flavor}" +base_image="${base_image:-frouioui/bootstrap:$version-common}" +image="${image:-frouioui/bootstrap:$version-$flavor}" while [ $# -gt 0 ]; do if [[ $1 == *"--"* ]]; then From d35d98f9fa6bb605d286c11205354d3e03e357ad Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 8 Aug 2023 16:27:47 +0200 Subject: [PATCH 51/53] remove debug code Signed-off-by: Florent Poinsard --- Makefile | 2 +- docker/bootstrap/Dockerfile.mysql57 | 2 +- docker/bootstrap/Dockerfile.mysql80 | 2 +- docker/bootstrap/Dockerfile.percona57 | 2 +- docker/bootstrap/Dockerfile.percona80 | 2 +- docker/bootstrap/build.sh | 4 ++-- docker/lite/Dockerfile.mysql57 | 2 +- docker/lite/Dockerfile.mysql80 | 2 +- docker/lite/Dockerfile.percona57 | 2 +- docker/lite/Dockerfile.percona80 | 2 +- docker/lite/Dockerfile.ubi7.mysql57 | 2 +- docker/lite/Dockerfile.ubi7.mysql80 | 2 +- docker/lite/Dockerfile.ubi7.percona57 | 2 +- docker/lite/Dockerfile.ubi7.percona80 | 2 +- docker/lite/Dockerfile.ubi8.arm64.mysql80 | 2 +- docker/lite/Dockerfile.ubi8.mysql80 | 2 +- examples/operator/101_initial_cluster.yaml | 12 ++++++------ 17 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 8073fe9b1bc..3af32a1d7b3 100644 --- a/Makefile +++ b/Makefile @@ -285,7 +285,7 @@ docker_bootstrap_test: flavors='$(DOCKER_IMAGES_FOR_TEST)' && ./test.go -pull=false -parallel=2 -bootstrap-version=${BOOTSTRAP_VERSION} -flavor=$${flavors// /,} docker_bootstrap_push: - for i in $(DOCKER_IMAGES); do echo "pushing bootstrap image: ${BOOTSTRAP_VERSION}-$$i"; docker push frouioui/bootstrap:${BOOTSTRAP_VERSION}-$$i || exit 1; done + for i in $(DOCKER_IMAGES); do echo "pushing bootstrap image: ${BOOTSTRAP_VERSION}-$$i"; docker push vitess/bootstrap:${BOOTSTRAP_VERSION}-$$i || exit 1; done # Use this target to update the local copy of your images with the one on Dockerhub. docker_bootstrap_pull: diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 4e563bb4f71..4e9b335ddac 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -1,5 +1,5 @@ ARG bootstrap_version -ARG image="frouioui/bootstrap:${bootstrap_version}-common" +ARG image="vitess/bootstrap:${bootstrap_version}-common" FROM --platform=linux/amd64 "${image}" diff --git a/docker/bootstrap/Dockerfile.mysql80 b/docker/bootstrap/Dockerfile.mysql80 index 00d256dfdca..059f01b8101 100644 --- a/docker/bootstrap/Dockerfile.mysql80 +++ b/docker/bootstrap/Dockerfile.mysql80 @@ -1,5 +1,5 @@ ARG bootstrap_version -ARG image="frouioui/bootstrap:${bootstrap_version}-common" +ARG image="vitess/bootstrap:${bootstrap_version}-common" FROM --platform=linux/amd64 "${image}" diff --git a/docker/bootstrap/Dockerfile.percona57 b/docker/bootstrap/Dockerfile.percona57 index e9e008fd95a..febe09fd8bf 100644 --- a/docker/bootstrap/Dockerfile.percona57 +++ b/docker/bootstrap/Dockerfile.percona57 @@ -1,5 +1,5 @@ ARG bootstrap_version -ARG image="frouioui/bootstrap:${bootstrap_version}-common" +ARG image="vitess/bootstrap:${bootstrap_version}-common" FROM --platform=linux/amd64 "${image}" diff --git a/docker/bootstrap/Dockerfile.percona80 b/docker/bootstrap/Dockerfile.percona80 index c3309acf473..446ec554612 100644 --- a/docker/bootstrap/Dockerfile.percona80 +++ b/docker/bootstrap/Dockerfile.percona80 @@ -1,5 +1,5 @@ ARG bootstrap_version -ARG image="frouioui/bootstrap:${bootstrap_version}-common" +ARG image="vitess/bootstrap:${bootstrap_version}-common" FROM --platform=linux/amd64 "${image}" diff --git a/docker/bootstrap/build.sh b/docker/bootstrap/build.sh index 9a2acce8485..8cc6a151606 100755 --- a/docker/bootstrap/build.sh +++ b/docker/bootstrap/build.sh @@ -48,8 +48,8 @@ chmod -R o=rx *; arch=$(uname -m) -base_image="${base_image:-frouioui/bootstrap:$version-common}" -image="${image:-frouioui/bootstrap:$version-$flavor}" +base_image="${base_image:-vitess/bootstrap:$version-common}" +image="${image:-vitess/bootstrap:$version-$flavor}" while [ $# -gt 0 ]; do if [[ $1 == *"--"* ]]; then diff --git a/docker/lite/Dockerfile.mysql57 b/docker/lite/Dockerfile.mysql57 index 0a2a70b9afe..8244c4b1bd1 100644 --- a/docker/lite/Dockerfile.mysql57 +++ b/docker/lite/Dockerfile.mysql57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql57" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.mysql80 b/docker/lite/Dockerfile.mysql80 index 932f90a93a6..022de0fb39a 100644 --- a/docker/lite/Dockerfile.mysql80 +++ b/docker/lite/Dockerfile.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.percona57 b/docker/lite/Dockerfile.percona57 index febb94e3519..6c18a75893c 100644 --- a/docker/lite/Dockerfile.percona57 +++ b/docker/lite/Dockerfile.percona57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-percona57" +ARG image="vitess/bootstrap:${bootstrap_version}-percona57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.percona80 b/docker/lite/Dockerfile.percona80 index ea633765846..f6a47fe8c91 100644 --- a/docker/lite/Dockerfile.percona80 +++ b/docker/lite/Dockerfile.percona80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-percona80" +ARG image="vitess/bootstrap:${bootstrap_version}-percona80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.mysql57 b/docker/lite/Dockerfile.ubi7.mysql57 index 584dba13c0d..dd5dec08730 100644 --- a/docker/lite/Dockerfile.ubi7.mysql57 +++ b/docker/lite/Dockerfile.ubi7.mysql57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql57" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.mysql80 b/docker/lite/Dockerfile.ubi7.mysql80 index 547586a5ae1..2e84ddd7000 100644 --- a/docker/lite/Dockerfile.ubi7.mysql80 +++ b/docker/lite/Dockerfile.ubi7.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.percona57 b/docker/lite/Dockerfile.ubi7.percona57 index a833c559876..435e985cb45 100644 --- a/docker/lite/Dockerfile.ubi7.percona57 +++ b/docker/lite/Dockerfile.ubi7.percona57 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-percona57" +ARG image="vitess/bootstrap:${bootstrap_version}-percona57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.percona80 b/docker/lite/Dockerfile.ubi7.percona80 index 5d9a33fdbe6..4cc4941584a 100644 --- a/docker/lite/Dockerfile.ubi7.percona80 +++ b/docker/lite/Dockerfile.ubi7.percona80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-percona80" +ARG image="vitess/bootstrap:${bootstrap_version}-percona80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi8.arm64.mysql80 b/docker/lite/Dockerfile.ubi8.arm64.mysql80 index 987511c13e7..1f06a3a4b38 100644 --- a/docker/lite/Dockerfile.ubi8.arm64.mysql80 +++ b/docker/lite/Dockerfile.ubi8.arm64.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi8.mysql80 b/docker/lite/Dockerfile.ubi8.mysql80 index ed88ec89c34..a30cbff5f23 100644 --- a/docker/lite/Dockerfile.ubi8.mysql80 +++ b/docker/lite/Dockerfile.ubi8.mysql80 @@ -18,7 +18,7 @@ # Use a temporary layer for the build stage. ARG bootstrap_version=20 -ARG image="frouioui/bootstrap:${bootstrap_version}-mysql80" +ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 447bb43e762..22cdc6f686d 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -8,14 +8,14 @@ metadata: name: example spec: images: - vtctld: frouioui/lite:mysql57 + vtctld: vitess/lite:latest vtadmin: vitess/vtadmin:latest - vtgate: frouioui/lite:mysql57 - vttablet: frouioui/lite:mysql57 - vtbackup: frouioui/lite:mysql57 - vtorc: frouioui/lite:mysql57 + vtgate: vitess/lite:latest + vttablet: vitess/lite:latest + vtbackup: vitess/lite:latest + vtorc: vitess/lite:latest mysqld: - mysql56Compatible: frouioui/lite:mysql57 + mysql80Compatible: vitess/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 From 3a7b499747e58ff35a28f35dbd8f9a5556d60172 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 8 Aug 2023 17:38:17 +0200 Subject: [PATCH 52/53] edit release notes Signed-off-by: Florent Poinsard --- changelog/18.0/18.0.0/summary.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/changelog/18.0/18.0.0/summary.md b/changelog/18.0/18.0.0/summary.md index c8a24e99170..373f8f88561 100644 --- a/changelog/18.0/18.0.0/summary.md +++ b/changelog/18.0/18.0.0/summary.md @@ -112,10 +112,4 @@ Bullseye images will still be built and available as long as the OS build is cur Buster LTS supports will stop in June 2024, and Vitess v18.0 will be supported through October 2024. To prevent supporting a deprecated buster build for several months after June 2024, we are preemptively -removing Vitess support for MySQL 80 and Percona Docker images. - -The `vitess/bootstrap:mysql57` and `vitess/lite:mysql57` images are still available but will be built on Buster -since MySQL 57 is not available on Bullseye and earlier versions of Debian. The Golang version used for those -image will remain on `go1.20.5` as Golang does not provide a Buster image for `go1.20.6` and more recent Go versions. -All other images will be built on Bullseye and/or Bookworm as explained in the [Bookworm added and made default](#debian-bookworm) section, -and will continue to use the latest available Golang `go1.20` patch. \ No newline at end of file +removing Vitess support. \ No newline at end of file From b6ce170fb129bed1702ae302ca728fb36cac24e3 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 9 Aug 2023 11:14:00 +0200 Subject: [PATCH 53/53] update changelog and re-run CI with newly pushed bootstrap image Signed-off-by: Florent Poinsard --- docker/bootstrap/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/bootstrap/CHANGELOG.md b/docker/bootstrap/CHANGELOG.md index 88cfdd06a66..1352f63aeb5 100644 --- a/docker/bootstrap/CHANGELOG.md +++ b/docker/bootstrap/CHANGELOG.md @@ -76,4 +76,4 @@ List of changes between bootstrap image versions. ## [20] - 2023-08-03 ### Changes -- Bump all images (besides mysql57) to bullseye base image \ No newline at end of file +- Bump all images to bullseye base image \ No newline at end of file