From 1575d7938de5d5927c959db0c27203fd631cdbb4 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 11 Sep 2024 14:20:53 -0600 Subject: [PATCH] Remove mysql57 from docker images Signed-off-by: Florent Poinsard --- .github/workflows/docker_build_base.yml | 2 +- .github/workflows/docker_build_lite.yml | 2 +- .github/workflows/docker_build_vttestserver.yml | 2 +- Makefile | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker_build_base.yml b/.github/workflows/docker_build_base.yml index e40a029125a..5dbdbb85891 100644 --- a/.github/workflows/docker_build_base.yml +++ b/.github/workflows/docker_build_base.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: true matrix: - branch: [ latest, mysql57, percona57, percona80 ] + branch: [ latest, percona80 ] steps: - name: Check out code diff --git a/.github/workflows/docker_build_lite.yml b/.github/workflows/docker_build_lite.yml index 80cc888239b..e302b895809 100644 --- a/.github/workflows/docker_build_lite.yml +++ b/.github/workflows/docker_build_lite.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: true matrix: - branch: [ latest, mysql57, mysql80, percona57, percona80 ] + branch: [ latest, mysql80, percona80 ] steps: - name: Check out code diff --git a/.github/workflows/docker_build_vttestserver.yml b/.github/workflows/docker_build_vttestserver.yml index 927e55be3e0..bab6b64f389 100644 --- a/.github/workflows/docker_build_vttestserver.yml +++ b/.github/workflows/docker_build_vttestserver.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: true matrix: - branch: [ mysql57, mysql80 ] + branch: [ mysql80 ] steps: - name: Check out code diff --git a/Makefile b/Makefile index 5801788335c..7efadd2b625 100644 --- a/Makefile +++ b/Makefile @@ -321,7 +321,7 @@ endef docker_base: ${call build_docker_image,docker/base/Dockerfile,vitess/base} -DOCKER_BASE_SUFFIX = mysql80 percona57 percona80 +DOCKER_BASE_SUFFIX = mysql80 percona80 DOCKER_BASE_TARGETS = $(addprefix docker_base_, $(DOCKER_BASE_SUFFIX)) $(DOCKER_BASE_TARGETS): docker_base_%: ${call build_docker_image,docker/base/Dockerfile.$*,vitess/base:$*} @@ -350,7 +350,7 @@ docker_run_local: docker_mini: ${call build_docker_image,docker/mini/Dockerfile,vitess/mini} -DOCKER_VTTESTSERVER_SUFFIX = mysql57 mysql80 +DOCKER_VTTESTSERVER_SUFFIX = mysql80 DOCKER_VTTESTSERVER_TARGETS = $(addprefix docker_vttestserver_,$(DOCKER_VTTESTSERVER_SUFFIX)) $(DOCKER_VTTESTSERVER_TARGETS): docker_vttestserver_%: ${call build_docker_image,docker/vttestserver/Dockerfile.$*,vitess/vttestserver:$*}