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

Jump to bottom

[release-19.0] Remove mysql57 from docker images #16763

Merged
merged 1 commit into from
Sep 12, 2024
Merged

[release-19.0] Remove mysql57 from docker images #16763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/docker_build_base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: true
matrix:
branch: [ latest, mysql57, percona57, percona80 ]
branch: [ latest, percona80 ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this not have mysql80?

Copy link
Member Author

@frouioui frouioui Sep 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the base image we do not publish a vitess/base:v19.0.6-mysql80 image. We only publish the following:

vitess/base:v19.0.6    <<<---- is in fact mysql80
vitess/base:v19.0.6-percona80

Starting in v20 we got rid of the base image, I would not suggest fixing this irregularity since v19 will be dropped in 5 months.


steps:
- name: Check out code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_build_lite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: true
matrix:
branch: [ latest, mysql57, mysql80, percona57, percona80 ]
branch: [ latest, mysql80, percona80 ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is latest the same as mysql80? Same image with two tags?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's correct, we have a static link between ./docker/lite/Dockerfile and ./docker/lite/Dockerfile.mysql80, they're exactly the same Dockerfile. But for the lite image, we do explicitly push three different tags:

# For a tag/release:

vitess/lite:v19.0.6
vitess/lite:v19.0.6-mysql80
vitess/lite:v19.0.6-percona80

# For a commit to the main branch, only without the tag without suffix:

vitess/lite:v19.0.6

This behavior has been correct in v20+, we stopped publishing the extra ...-mysql80 image as it became irrelevant.


steps:
- name: Check out code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_build_vttestserver.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: true
matrix:
branch: [ mysql57, mysql80 ]
branch: [ mysql80 ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose no one has asked for a percona80 version of this image.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not that I am aware of, but we could easily add it if needed.


steps:
- name: Check out code
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:$*}
Expand Down Expand Up @@ -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:$*}
Expand Down
Loading