From c7469ca44da044556346a801c9c9e64ad6314eab Mon Sep 17 00:00:00 2001 From: Martin Hutchinson Date: Thu, 2 Nov 2023 14:54:13 +0000 Subject: [PATCH 1/4] Updated all MySQL deps to 8.0 #3182 This PR is primarily being raised as a smoke test to see whether this is going to be simple or not --- cloudbuild_master.yaml | 2 +- cloudbuild_pr.yaml | 2 +- cloudbuild_tag.yaml | 2 +- examples/deployment/kubernetes/mysql/image/Dockerfile | 2 +- integration/cloudbuild/docker-compose.mysql.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cloudbuild_master.yaml b/cloudbuild_master.yaml index f3e2833866..219ba18a09 100644 --- a/cloudbuild_master.yaml +++ b/cloudbuild_master.yaml @@ -2,7 +2,7 @@ timeout: 1800s substitutions: _CLUSTER_NAME: trillian-opensource-ci _MASTER_ZONE: us-central1-a - _MYSQL_TAG: "5.7" + _MYSQL_TAG: "8.0" _MYSQL_ROOT_PASSWORD: "" _MYSQL_PASSWORD: "" options: diff --git a/cloudbuild_pr.yaml b/cloudbuild_pr.yaml index a680ce56ed..3b7b061450 100644 --- a/cloudbuild_pr.yaml +++ b/cloudbuild_pr.yaml @@ -5,7 +5,7 @@ timeout: 1800s substitutions: _CLUSTER_NAME: trillian-opensource-ci _MASTER_ZONE: us-central1-a - _MYSQL_TAG: "5.7" + _MYSQL_TAG: "8.0" _MYSQL_ROOT_PASSWORD: "" _MYSQL_PASSWORD: "" options: diff --git a/cloudbuild_tag.yaml b/cloudbuild_tag.yaml index 37a5065705..680c0baf27 100644 --- a/cloudbuild_tag.yaml +++ b/cloudbuild_tag.yaml @@ -1,6 +1,6 @@ timeout: 1800s substitutions: - _MYSQL_TAG: "5.7" + _MYSQL_TAG: "8.0" options: machineType: E2_HIGHCPU_32 steps: diff --git a/examples/deployment/kubernetes/mysql/image/Dockerfile b/examples/deployment/kubernetes/mysql/image/Dockerfile index 6e79feb6ff..10ead6a61f 100644 --- a/examples/deployment/kubernetes/mysql/image/Dockerfile +++ b/examples/deployment/kubernetes/mysql/image/Dockerfile @@ -25,7 +25,7 @@ RUN apt-get update \ # consistently, regardless of whatever dependencies get added RUN groupadd -r mysql && useradd -r -g mysql mysql -ENV MYSQL_VERSION 5.7 +ENV MYSQL_VERSION 8.0 ENV TERM linux # Install perl. diff --git a/integration/cloudbuild/docker-compose.mysql.yml b/integration/cloudbuild/docker-compose.mysql.yml index 82b49045c8..7989e117f0 100644 --- a/integration/cloudbuild/docker-compose.mysql.yml +++ b/integration/cloudbuild/docker-compose.mysql.yml @@ -2,7 +2,7 @@ version: '3.1' services: db: - image: ${MYSQLD_IMAGE:-mysql:5.7} + image: ${MYSQLD_IMAGE:-mysql:8.0} restart: always environment: MYSQL_ROOT_PASSWORD: 'bananas' From 613ea9224acf2a3524903b976c00303d1517c0a1 Mon Sep 17 00:00:00 2001 From: Martin Hutchinson Date: Thu, 2 Nov 2023 14:59:50 +0000 Subject: [PATCH 2/4] Use the different marketplace repo --- cloudbuild_master.yaml | 8 ++++---- cloudbuild_pr.yaml | 8 ++++---- cloudbuild_tag.yaml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cloudbuild_master.yaml b/cloudbuild_master.yaml index 219ba18a09..73db4ac90e 100644 --- a/cloudbuild_master.yaml +++ b/cloudbuild_master.yaml @@ -12,20 +12,20 @@ steps: name : gcr.io/cloud-builders/docker args: - pull - - marketplace.gcr.io/google/mysql5:${_MYSQL_TAG} + - marketplace.gcr.io/google/mysql8:${_MYSQL_TAG} - id: tag_mysql name: gcr.io/cloud-builders/docker args: - tag - - marketplace.gcr.io/google/mysql5:${_MYSQL_TAG} - - gcr.io/${PROJECT_ID}/mysql5:${_MYSQL_TAG} + - marketplace.gcr.io/google/mysql8:${_MYSQL_TAG} + - gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG} waitFor: - pull_mysql - id: push_mysql name: gcr.io/cloud-builders/docker args: - push - - gcr.io/${PROJECT_ID}/mysql5:${_MYSQL_TAG} + - gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG} waitFor: - tag_mysql - id: build_db_server diff --git a/cloudbuild_pr.yaml b/cloudbuild_pr.yaml index 3b7b061450..05349ad19d 100644 --- a/cloudbuild_pr.yaml +++ b/cloudbuild_pr.yaml @@ -17,20 +17,20 @@ steps: name : gcr.io/cloud-builders/docker args: - pull - - marketplace.gcr.io/google/mysql5:${_MYSQL_TAG} + - marketplace.gcr.io/google/mysql8:${_MYSQL_TAG} - id: tag_mysql name: gcr.io/cloud-builders/docker args: - tag - - marketplace.gcr.io/google/mysql5:${_MYSQL_TAG} - - gcr.io/${PROJECT_ID}/mysql5:${_MYSQL_TAG} + - marketplace.gcr.io/google/mysql8:${_MYSQL_TAG} + - gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG} waitFor: - pull_mysql - id: push_mysql name: gcr.io/cloud-builders/docker args: - push - - gcr.io/${PROJECT_ID}/mysql5:${_MYSQL_TAG} + - gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG} waitFor: - tag_mysql diff --git a/cloudbuild_tag.yaml b/cloudbuild_tag.yaml index 680c0baf27..35d9e5920b 100644 --- a/cloudbuild_tag.yaml +++ b/cloudbuild_tag.yaml @@ -8,20 +8,20 @@ steps: name : gcr.io/cloud-builders/docker args: - pull - - marketplace.gcr.io/google/mysql5:${_MYSQL_TAG} + - marketplace.gcr.io/google/mysql8:${_MYSQL_TAG} - id: tag_mysql name: gcr.io/cloud-builders/docker args: - tag - - marketplace.gcr.io/google/mysql5:${_MYSQL_TAG} - - gcr.io/${PROJECT_ID}/mysql5:${_MYSQL_TAG} + - marketplace.gcr.io/google/mysql8:${_MYSQL_TAG} + - gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG} waitFor: - pull_mysql - id: push_mysql name: gcr.io/cloud-builders/docker args: - push - - gcr.io/${PROJECT_ID}/mysql5:${_MYSQL_TAG} + - gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG} waitFor: - tag_mysql - id: build_db_server From e3bfb8573b10eb9eefc672605e45eda1f5572c6a Mon Sep 17 00:00:00 2001 From: Martin Hutchinson Date: Thu, 2 Nov 2023 15:11:56 +0000 Subject: [PATCH 3/4] Updated remaining file --- examples/deployment/docker/db_server/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/deployment/docker/db_server/Dockerfile b/examples/deployment/docker/db_server/Dockerfile index 4af5e1a8ad..a113cc285d 100644 --- a/examples/deployment/docker/db_server/Dockerfile +++ b/examples/deployment/docker/db_server/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/trillian-opensource-ci/mysql5:5.7@sha256:3f355bed2d85d4ad266771b3c7ddf4251ee5d8a45afc140336d1c0cab9dc5171 +FROM gcr.io/trillian-opensource-ci/mysql8:8.0@sha256:89d1c5d48cee111cdc6348704044a60578f5c0af9dfc55b6e58e32a01906bd21 # Patch the OS-level packages and remove unneeded dependencies. ENV DEBIAN_FRONTEND=noninteractive From 9ae9d22d8f81170e85e41a75c68a3a4da2d48d81 Mon Sep 17 00:00:00 2001 From: Martin Hutchinson Date: Thu, 2 Nov 2023 15:12:52 +0000 Subject: [PATCH 4/4] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e911571a4..032b0693b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## HEAD +* Bump CI version of MySQL from 5.7 to 8.0 * Bump golangci-lint from 1.51.1 to 1.55.1 (developers should update to this version) ## v1.5.3