Update the MySQL version used by our Docker images (#12054)

* Change default MySQL version of lite and base to mysql80 instead of mysql57 Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr> * Bump MySQL version to 8.0.31 in install_dependencies.sh Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr> * addition of label to the mysql80 image Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr> * apply review suggestions Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr> * bring back mysql80 label Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr> * add release summary Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr> --------- Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
vitessio · Feb 2, 2023 · f139edd · f139edd
1 parent d6123ca
commit f139edd
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 39 deletions.
diff --git a/doc/releasenotes/16_0_0_summary.md b/doc/releasenotes/16_0_0_summary.md
@@ -61,6 +61,10 @@ The flag `disable-replication-manager` is deprecated and will be removed in a la
 
 ### Breaking Changes
 
+#### Default MySQL version on Docker
+
+The default MySQL version use by our `vitess/lite:latest` image is going from `5.7` to `8.0`. Additionally, the default version of the `vitess/lite:mysql80` image goes from `8.0.23` to `8.0.31`.
+
 #### vtctld UI Removal
 In v13, the vtctld UI was deprecated. As of this release, the `web/vtctld2` directory is deleted and the UI will no longer be included in any Vitess images going forward. All build scripts and the Makefile have been updated to reflect this change.
 

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
@@ -12,17 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# NOTE: This file is also symlinked as "Dockerfile" in the root of our
-# repository because the automated build feature on Docker Hub does not
-# allow to specify a different build context. It always assumes that the
-# build context is the same directory as the Dockerfile is in.
-# "make build" below must be called in our repository's root and
-# therefore we need to have the symlinked "Dockerfile" in there as well.
-# TODO(mberlin): Remove the symlink and this note once
-# https://github.com/docker/hub-feedback/issues/292 is fixed.
-
 ARG bootstrap_version=14
-ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
+ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"
 
 FROM "${image}"
 

diff --git a/docker/base/Dockerfile.mysql57 b/docker/base/Dockerfile.mysql57
@@ -0,0 +1,41 @@
+# Copyright 2023 The Vitess Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ARG bootstrap_version=14
+ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
+
+FROM "${image}"
+
+# Allows some docker builds to disable CGO
+ARG CGO_ENABLED=0
+
+# Allows docker builds to set the BUILD_NUMBER
+ARG BUILD_NUMBER
+
+# Allows docker builds to set the BUILD_GIT_BRANCH
+ARG BUILD_GIT_BRANCH
+
+# Allows docker builds to set the BUILD_GIT_REV
+ARG BUILD_GIT_REV
+
+# Re-copy sources from working tree
+USER root
+COPY . /vt/src/vitess.io/vitess
+
+# Build Vitess
+RUN make build
+
+# Fix permissions
+RUN chown -R vitess:vitess /vt
+USER vitess
diff --git a/docker/base/Dockerfile.mysql80 b/docker/base/Dockerfile.mysql80
diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57
@@ -1,3 +1,17 @@
+# Copyright 2023 The Vitess Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ARG bootstrap_version=14
 ARG image="vitess/bootstrap:${bootstrap_version}-percona57"
 

diff --git a/docker/base/Dockerfile.percona80 b/docker/base/Dockerfile.percona80
@@ -1,3 +1,17 @@
+# Copyright 2023 The Vitess Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ARG bootstrap_version=14
 ARG image="vitess/bootstrap:${bootstrap_version}-percona80"
 

diff --git a/docker/lite/Dockerfile b/docker/lite/Dockerfile
@@ -1 +1 @@
-Dockerfile.mysql57
+Dockerfile.mysql80
diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh
@@ -83,7 +83,7 @@ mysql57)
  )
  ;;
 mysql80)
- mysql8_version=8.0.23
+ mysql8_version=8.0.31
  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