Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated all MySQL deps to 8.0 #3182 #3183

Merged
merged 4 commits into from
Nov 6, 2023
Merged

Updated all MySQL deps to 8.0 #3182 #3183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7469ca
Updated all MySQL deps to 8.0 #3182
mhutchinson Nov 2, 2023
613ea92
Use the different marketplace repo
mhutchinson Nov 2, 2023
e3bfb85
Updated remaining file
mhutchinson Nov 2, 2023
9ae9d22
Updated changelog
mhutchinson Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions cloudbuild_master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions cloudbuild_pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down
10 changes: 5 additions & 5 deletions cloudbuild_tag.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
timeout: 1800s
substitutions:
_MYSQL_TAG: "5.7"
_MYSQL_TAG: "8.0"
options:
machineType: E2_HIGHCPU_32
steps:
- id: pull_mysql
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
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment/docker/db_server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment/kubernetes/mysql/image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion integration/cloudbuild/docker-compose.mysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading