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.

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

Bump docker images to bullseye #13664

Merged
merged 54 commits into from
Aug 9, 2023
Merged
Changes from 53 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
d164d36
bump docker images to bullseye
frouioui Jul 28, 2023
6c55af5
use default-mysql-server to install mysql
frouioui Jul 28, 2023
e16a187
revert back to percona
frouioui Jul 28, 2023
df9b730
use server-server
frouioui Jul 28, 2023
b486a49
install mysql57 in a separate apt call
frouioui Jul 28, 2023
eaaabcd
get mysql57 from mysql apt repo
frouioui Jul 28, 2023
ecfa2e2
update percona-57 dockerfile to run the apt-get install step in two s…
frouioui Jul 28, 2023
685b391
push to frouioui repository for test purposes
frouioui Jul 31, 2023
20292a6
[debug] build and push on frouioui user
frouioui Jul 31, 2023
87817b0
[debug] build lite image on frouioui user
frouioui Jul 31, 2023
ee1cd70
use bullseye for the mysql repo on bootstrap 57 builds
frouioui Jul 31, 2023
4aede10
test operator example with frouioui docker repo
frouioui Aug 1, 2023
80ef4bc
Merge remote-tracking branch 'origin/main' into update-to-bookworm
frouioui Aug 1, 2023
b6e9049
remove add-apt-repo for mysql bullseye 57
frouioui Aug 1, 2023
25b5ce3
install mysql57 from source in bootstrap mysql57
frouioui Aug 1, 2023
5c1e18f
fix typo in apt-get install instruction
frouioui Aug 1, 2023
534f74d
remove unwanted sudo command and remove mysql57 installation steps fr…
frouioui Aug 1, 2023
e70b871
install source
frouioui Aug 1, 2023
e0b0e92
remove install and usage of source
frouioui Aug 1, 2023
a5b46d2
use mysql57 in the 101 operator example
frouioui Aug 1, 2023
585b4cd
use mysql56Compatible in the 101 operator example
frouioui Aug 1, 2023
57a31d2
[debug] revert to vitess/lite:v17.0.1 for testing purpose
frouioui Aug 1, 2023
9b54f99
add mysql57 case in install_dependencies.sh
frouioui Aug 1, 2023
f875919
use frouioui for docker_lite_target push
frouioui Aug 1, 2023
cfdd17b
use frouioui/lite:mysql57 in 101
frouioui Aug 1, 2023
a04ed59
install mysql57 in install_dependencies instead of the bootstrap image
frouioui Aug 1, 2023
df32525
add pkg-config to list of deps to install for lite-mysql57
frouioui Aug 1, 2023
271c7ef
use proper path for mysql binaries
frouioui Aug 1, 2023
96731ee
move all binaries to /usr/bin
frouioui Aug 1, 2023
b249baf
debug mysql root path finding
frouioui Aug 2, 2023
18162e4
improve data dir init and use vitess user
frouioui Aug 2, 2023
c426623
fix the add to group insdtruction
frouioui Aug 2, 2023
e4b7354
use usermod
frouioui Aug 2, 2023
256f2f7
add vitess user
frouioui Aug 2, 2023
b8dc250
follow proper data dir init steps
frouioui Aug 2, 2023
9a9dd86
tweak permissions
frouioui Aug 2, 2023
799132d
Bump bootstrap version to 20 and add new common-mysql57 image to rema…
frouioui Aug 3, 2023
d2bddf8
[debug] use frouioui for bootstrap images
frouioui Aug 3, 2023
34338ef
rpm import new gpg key for mysql
frouioui Aug 3, 2023
87ac8a7
add proper gpg key to all ubi images
frouioui Aug 7, 2023
abea990
add docker_lite_push utility
frouioui Aug 7, 2023
fabe6ec
use proper image for operator examples
frouioui Aug 7, 2023
8659c3b
test with 57
frouioui Aug 7, 2023
61271d4
revert debug changes
frouioui Aug 7, 2023
9a444b2
revert more debug changes in the examples
frouioui Aug 7, 2023
5c2e399
update the release notes
frouioui Aug 7, 2023
8d051b6
update bootstrap version in test.go too
frouioui Aug 7, 2023
5d0b77b
upgrade mysql57 to bullseye while keeping the buster package installa…
frouioui Aug 8, 2023
1db56f6
[debug] push and use frouioui images
frouioui Aug 8, 2023
a3d0544
use bullseye for mysql57 on vttestserver
frouioui Aug 8, 2023
3c5dc9a
use frouioui in bootstrap docker build
frouioui Aug 8, 2023
d35d98f
remove debug code
frouioui Aug 8, 2023
3a7b499
edit release notes
frouioui Aug 8, 2023
b6ce170
update changelog and re-run CI with newly pushed bootstrap image
frouioui Aug 9, 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
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -273,7 +273,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
# This rule builds the bootstrap images for all flavors.
DOCKER_IMAGES_FOR_TEST = mysql57 mysql80 percona57 percona80
DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
BOOTSTRAP_VERSION=19
BOOTSTRAP_VERSION=20
ensure_bootstrap_version:
find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \;
sed -i 's/\(^.*flag.String(\"bootstrap-version\",\) *\"[^\"]\+\"/\1 \"${BOOTSTRAP_VERSION}\"/' test.go
@@ -327,6 +327,9 @@ DOCKER_LITE_TARGETS = $(addprefix docker_lite_,$(DOCKER_LITE_SUFFIX))
$(DOCKER_LITE_TARGETS): docker_lite_%:
${call build_docker_image,docker/lite/Dockerfile.$*,vitess/lite:$*}

docker_lite_push:
for i in $(DOCKER_LITE_SUFFIX); do echo "pushing lite image: $$i"; docker push vitess/lite:$$i || exit 1; done

docker_lite_all: docker_lite $(DOCKER_LITE_TARGETS)

docker_local:
2 changes: 1 addition & 1 deletion changelog/18.0/18.0.0/summary.md
Original file line number Diff line number Diff line change
@@ -112,4 +112,4 @@ Bullseye images will still be built and available as long as the OS build is cur

Buster LTS supports will stop in June 2024, and Vitess v18.0 will be supported through October 2024.
To prevent supporting a deprecated buster build for several months after June 2024, we are preemptively
removing Vitess support.
removing Vitess support.
2 changes: 1 addition & 1 deletion docker/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}"
2 changes: 1 addition & 1 deletion docker/base/Dockerfile.mysql57
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"

FROM "${image}"
2 changes: 1 addition & 1 deletion docker/base/Dockerfile.percona57
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-percona57"

FROM "${image}"
2 changes: 1 addition & 1 deletion docker/base/Dockerfile.percona80
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-percona80"

FROM "${image}"
6 changes: 5 additions & 1 deletion docker/bootstrap/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -72,4 +72,8 @@ List of changes between bootstrap image versions.

## [19] - 2023-06-07
### Changes
- Update build to golang 1.20.5
- Update build to golang 1.20.5

## [20] - 2023-08-03
### Changes
- Bump all images (besides mysql57) to bullseye base image
frouioui marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion docker/bootstrap/Dockerfile.common
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 golang:1.20.5-buster
FROM --platform=linux/amd64 golang:1.20.5-bullseye

# Install Vitess build dependencies
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
4 changes: 2 additions & 2 deletions docker/bootstrap/Dockerfile.mysql80
Original file line number Diff line number Diff line change
@@ -6,9 +6,9 @@ FROM --platform=linux/amd64 "${image}"
# Install MySQL 8.0
RUN for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 8C718D3B5072E1F5 && break; done && \
for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 467B942D3A79BD29 && break; done && \
add-apt-repository 'deb http://repo.mysql.com/apt/debian/ buster mysql-8.0' && \
add-apt-repository 'deb http://repo.mysql.com/apt/debian/ bullseye mysql-8.0' && \
for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \
echo 'deb http://repo.percona.com/apt buster main' > /etc/apt/sources.list.d/percona.list && \
echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list && \
{ \
echo debconf debconf/frontend select Noninteractive; \
echo percona-server-server-8.0 percona-server-server/root_password password 'unused'; \
7 changes: 3 additions & 4 deletions docker/bootstrap/Dockerfile.percona57
Original file line number Diff line number Diff line change
@@ -5,16 +5,15 @@ FROM --platform=linux/amd64 "${image}"

# Install Percona 5.7
RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \
add-apt-repository 'deb http://repo.percona.com/apt buster main' && \
add-apt-repository 'deb http://repo.percona.com/apt bullseye main' && \
{ \
echo debconf debconf/frontend select Noninteractive; \
echo percona-server-server-5.7 percona-server-server/root_password password 'unused'; \
echo percona-server-server-5.7 percona-server-server/root_password_again password 'unused'; \
} | debconf-set-selections && \
apt-get update && \
apt-get install -y --no-install-recommends \
percona-server-server-5.7 \
libperconaserverclient20-dev percona-xtrabackup-24 && \
apt-get install -y --no-install-recommends percona-server-server-5.7 && \
apt-get install -y --no-install-recommends libperconaserverclient20-dev percona-xtrabackup-24 && \
rm -rf /var/lib/apt/lists/*

# Bootstrap Vitess
4 changes: 2 additions & 2 deletions docker/bootstrap/Dockerfile.percona80
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ FROM --platform=linux/amd64 "${image}"

# Install Percona 8.0
RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done \
&& echo 'deb http://repo.percona.com/ps-80/apt buster main' > /etc/apt/sources.list.d/percona.list && \
&& echo 'deb http://repo.percona.com/ps-80/apt bullseye main' > /etc/apt/sources.list.d/percona.list && \
{ \
echo debconf debconf/frontend select Noninteractive; \
echo percona-server-server-8.0 percona-server-server/root_password password 'unused'; \
@@ -21,7 +21,7 @@ RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.c
rsync \
libev4 \
# && rm -f /etc/apt/sources.list.d/percona.list \
&& echo 'deb http://repo.percona.com/apt buster main' > /etc/apt/sources.list.d/percona.list \
&& echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list \
# { \
# echo debconf debconf/frontend select Noninteractive; \
# echo percona-server-server-8.0 percona-server-server/root_password password 'unused'; \
4 changes: 2 additions & 2 deletions docker/lite/Dockerfile.mysql57
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"

FROM "${image}" AS builder
@@ -33,7 +33,7 @@ USER vitess
RUN make install PREFIX=/vt/install

# Start over and build the final image.
FROM debian:buster-slim
FROM debian:bullseye-slim

# Install dependencies
COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh
4 changes: 2 additions & 2 deletions docker/lite/Dockerfile.mysql80
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}" AS builder
@@ -33,7 +33,7 @@ USER vitess
RUN make install PREFIX=/vt/install

# Start over and build the final image.
FROM debian:buster-slim
FROM debian:bullseye-slim

# Install dependencies
COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh
4 changes: 2 additions & 2 deletions docker/lite/Dockerfile.percona57
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-percona57"

FROM "${image}" AS builder
@@ -33,7 +33,7 @@ USER vitess
RUN make install PREFIX=/vt/install

# Start over and build the final image.
FROM debian:buster-slim
FROM debian:bullseye-slim

# Install dependencies
COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh
4 changes: 2 additions & 2 deletions docker/lite/Dockerfile.percona80
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-percona80"

FROM "${image}" AS builder
@@ -33,7 +33,7 @@ USER vitess
RUN make install PREFIX=/vt/install

# Start over and build the final image.
FROM debian:buster-slim
FROM debian:bullseye-slim

# Install dependencies
COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh
4 changes: 2 additions & 2 deletions docker/lite/Dockerfile.testing
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"

FROM "${image}" AS builder
@@ -33,7 +33,7 @@ USER vitess
RUN make install-testing PREFIX=/vt/install

# Start over and build the final image.
FROM debian:buster-slim
FROM debian:bullseye-slim

# Install dependencies
COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh
3 changes: 2 additions & 1 deletion docker/lite/Dockerfile.ubi7.mysql57
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"

FROM "${image}" AS builder
@@ -36,6 +36,7 @@ RUN make install PREFIX=/vt/install
FROM registry.access.redhat.com/ubi7/ubi:latest

# Install keys and dependencies
RUN rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022
RUN mkdir /tmp/gpg && chmod 700 /tmp/gpg && export GNUPGHOME=/tmp/gpg \
&& yum install -y --setopt=alwaysprompt=no gnupg \
&& ( gpg --keyserver keyserver.ubuntu.com --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 4D1BB29D63D98E422B2113B19334A25F8507EFA5 6341AB2753D78A78A7C27BB124C6A8A7F4A80EB5 A4A9406876FCBD3C456770C88C718D3B5072E1F5 ) \
3 changes: 2 additions & 1 deletion docker/lite/Dockerfile.ubi7.mysql80
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}" AS builder
@@ -36,6 +36,7 @@ RUN make install PREFIX=/vt/install
FROM registry.access.redhat.com/ubi7/ubi:latest

# Install keys and dependencies
RUN rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022
RUN mkdir /tmp/gpg && chmod 700 /tmp/gpg && export GNUPGHOME=/tmp/gpg \
&& yum install -y --setopt=alwaysprompt=no gnupg \
&& ( gpg --keyserver keyserver.ubuntu.com --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 4D1BB29D63D98E422B2113B19334A25F8507EFA5 6341AB2753D78A78A7C27BB124C6A8A7F4A80EB5 A4A9406876FCBD3C456770C88C718D3B5072E1F5 ) \
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.ubi7.percona57
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-percona57"

FROM "${image}" AS builder
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.ubi7.percona80
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-percona80"

FROM "${image}" AS builder
3 changes: 2 additions & 1 deletion docker/lite/Dockerfile.ubi8.arm64.mysql80
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}" AS builder
@@ -36,6 +36,7 @@ RUN make cross-install PREFIX=/vt/install GOOS=linux GOARCH=arm64
FROM registry.access.redhat.com/ubi8/ubi:latest

# Install keys and dependencies
RUN rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022
RUN mkdir /tmp/gpg && chmod 700 /tmp/gpg && export GNUPGHOME=/tmp/gpg \
&& yum install -y --setopt=alwaysprompt=no gnupg \
&& ( gpg --keyserver keyserver.ubuntu.com --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 3A79BD29 A4A9406876FCBD3C456770C88C718D3B5072E1F5 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 ) \
3 changes: 2 additions & 1 deletion docker/lite/Dockerfile.ubi8.mysql80
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}" AS builder
@@ -36,6 +36,7 @@ RUN make install PREFIX=/vt/install
FROM registry.access.redhat.com/ubi8/ubi:latest

# Install keys and dependencies
RUN rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022
RUN mkdir /tmp/gpg && chmod 700 /tmp/gpg && export GNUPGHOME=/tmp/gpg \
&& yum install -y --setopt=alwaysprompt=no gnupg \
&& ( gpg --keyserver keyserver.ubuntu.com --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 3A79BD29 A4A9406876FCBD3C456770C88C718D3B5072E1F5 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 ) \
47 changes: 25 additions & 22 deletions docker/lite/install_dependencies.sh
Original file line number Diff line number Diff line change
@@ -84,25 +84,25 @@ mysql57)
;;
mysql80)
mysql8_version=8.0.30
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-common_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-common_${mysql8_version}-1debian10_amd64.deb
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
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-community-client_${mysql8_version}-1debian10_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-client_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-client_${mysql8_version}-1debian10_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server-core_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-community-server-core_${mysql8_version}-1debian10_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-community-server_${mysql8_version}-1debian10_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-server_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-server_${mysql8_version}-1debian10_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-common_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-common_${mysql8_version}-1debian11_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/libmysqlclient21_${mysql8_version}-1debian11_amd64.deb /tmp/libmysqlclient21_${mysql8_version}-1debian11_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-core_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-community-client-core_${mysql8_version}-1debian11_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-plugins_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-community-client-plugins_${mysql8_version}-1debian11_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-community-client_${mysql8_version}-1debian11_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-client_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-client_${mysql8_version}-1debian11_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server-core_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-community-server-core_${mysql8_version}-1debian11_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-community-server_${mysql8_version}-1debian11_amd64.deb
do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-server_${mysql8_version}-1debian11_amd64.deb /tmp/mysql-server_${mysql8_version}-1debian11_amd64.deb
PACKAGES=(
/tmp/mysql-common_${mysql8_version}-1debian10_amd64.deb
/tmp/libmysqlclient21_${mysql8_version}-1debian10_amd64.deb
/tmp/mysql-community-client-core_${mysql8_version}-1debian10_amd64.deb
/tmp/mysql-community-client-plugins_${mysql8_version}-1debian10_amd64.deb
/tmp/mysql-community-client_${mysql8_version}-1debian10_amd64.deb
/tmp/mysql-client_${mysql8_version}-1debian10_amd64.deb
/tmp/mysql-community-server-core_${mysql8_version}-1debian10_amd64.deb
/tmp/mysql-community-server_${mysql8_version}-1debian10_amd64.deb
/tmp/mysql-server_${mysql8_version}-1debian10_amd64.deb
/tmp/mysql-common_${mysql8_version}-1debian11_amd64.deb
/tmp/libmysqlclient21_${mysql8_version}-1debian11_amd64.deb
/tmp/mysql-community-client-core_${mysql8_version}-1debian11_amd64.deb
/tmp/mysql-community-client-plugins_${mysql8_version}-1debian11_amd64.deb
/tmp/mysql-community-client_${mysql8_version}-1debian11_amd64.deb
/tmp/mysql-client_${mysql8_version}-1debian11_amd64.deb
/tmp/mysql-community-server-core_${mysql8_version}-1debian11_amd64.deb
/tmp/mysql-community-server_${mysql8_version}-1debian11_amd64.deb
/tmp/mysql-server_${mysql8_version}-1debian11_amd64.deb
percona-xtrabackup-80
)
;;
@@ -148,18 +148,21 @@ mysql57)
echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list
;;
mysql80)
echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-8.0' > /etc/apt/sources.list.d/mysql.list
echo 'deb http://repo.mysql.com/apt/debian/ bullseye mysql-8.0' > /etc/apt/sources.list.d/mysql.list
;;
esac

# Add extra apt repositories for Percona Server and/or Percona XtraBackup.
case "${FLAVOR}" in
mysql57|mysql80|percona57)
mysql57)
echo 'deb http://repo.percona.com/apt buster main' > /etc/apt/sources.list.d/percona.list
;;
mysql80|percona57)
echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list
;;
percona80)
echo 'deb http://repo.percona.com/apt buster main' > /etc/apt/sources.list.d/percona.list
echo 'deb http://repo.percona.com/ps-80/apt buster main' > /etc/apt/sources.list.d/percona80.list
echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list
echo 'deb http://repo.percona.com/ps-80/apt bullseye main' > /etc/apt/sources.list.d/percona80.list
;;
esac

2 changes: 1 addition & 1 deletion docker/local/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-common"

FROM "${image}"
4 changes: 2 additions & 2 deletions docker/vttestserver/Dockerfile.mysql57
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=19
ARG bootstrap_version=20
ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"

FROM "${image}" AS builder
@@ -33,7 +33,7 @@ USER vitess
RUN make install-testing PREFIX=/vt/install

# Start over and build the final image.
FROM debian:buster-slim
FROM debian:bullseye-slim

# Install dependencies
COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh
Loading