Fix bootstrap and clean up legacy install logic

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

Author: dbussink

docker/bootstrap/Dockerfile.common

@@ -12,9 +12,9 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     etcd-server \
     g++ \
     git \
+    gnupg \
     make \
     maven \
-    software-properties-common \
     unzip \
     zip \
     xvfb \

docker/bootstrap/Dockerfile.mysql80

@@ -8,7 +8,7 @@ USER root
 # 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 A8D3785C && break; done && \
-    add-apt-repository 'deb http://repo.mysql.com/apt/debian/ bookworm mysql-8.0' && \
+    echo 'deb http://repo.mysql.com/apt/debian/ bookworm mysql-8.0' > /etc/apt/sources.list.d/mysql.list && \
     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 bookworm main' > /etc/apt/sources.list.d/percona.list && \
     { \

docker/utils/install_dependencies.sh

@@ -71,25 +71,6 @@ apt-get install -y --no-install-recommends "${BASE_PACKAGES[@]}"
 
 # Packages specific to certain flavors.
 case "${FLAVOR}" in
-mysql57)
-    if [ -z "$VERSION" ]; then
-        VERSION=5.7.31
-    fi
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/libmysqlclient20_${VERSION}-1debian10_amd64.deb /tmp/libmysqlclient20_${VERSION}-1debian10_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-community-client_${VERSION}-1debian10_amd64.deb /tmp/mysql-community-client_${VERSION}-1debian10_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-client_${VERSION}-1debian10_amd64.deb /tmp/mysql-client_${VERSION}-1debian10_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-community-server_${VERSION}-1debian10_amd64.deb /tmp/mysql-community-server_${VERSION}-1debian10_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-server_${VERSION}-1debian10_amd64.deb /tmp/mysql-server_${VERSION}-1debian10_amd64.deb
-    PACKAGES=(
-        /tmp/libmysqlclient20_${VERSION}-1debian10_amd64.deb
-        /tmp/mysql-community-client_${VERSION}-1debian10_amd64.deb
-        /tmp/mysql-client_${VERSION}-1debian10_amd64.deb
-        /tmp/mysql-community-server_${VERSION}-1debian10_amd64.deb
-        /tmp/mysql-server_${VERSION}-1debian10_amd64.deb
-        mysql-shell
-        percona-xtrabackup-24
-    )
-    ;;
 mysql80)
     if [ -z "$VERSION" ]; then
         VERSION=8.0.40
@@ -117,20 +98,6 @@ mysql80)
         percona-xtrabackup-80
     )
     ;;
-percona)
-    PACKAGES=(
-        libcurl3
-        percona-server-server-5.6
-        percona-xtrabackup
-    )
-    ;;
-percona57)
-    PACKAGES=(
-        libperconaserverclient20
-        percona-server-server-5.7
-        percona-xtrabackup-24
-    )
-    ;;
 percona80)
     PACKAGES=(
         libperconaserverclient21
@@ -155,20 +122,14 @@ add_apt_key 9334A25F8507EFA5
 
 # Add extra apt repositories for MySQL.
 case "${FLAVOR}" in
-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/ bookworm 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)
-    echo 'deb http://repo.percona.com/apt buster main' > /etc/apt/sources.list.d/percona.list
-    ;;
-mysql80|percona57)
+mysql80)
     echo 'deb http://repo.percona.com/apt bookworm main' > /etc/apt/sources.list.d/percona.list
     ;;
 percona80)
@@ -179,15 +140,6 @@ esac
 
 # Pre-fill values for installation prompts that are normally interactive.
 case "${FLAVOR}" in
-percona57)
-    debconf-set-selections <<EOF
-debconf debconf/frontend select Noninteractive
-percona-server-server-5.7 percona-server-server/root_password password 'unused'
-percona-server-server-5.7 percona-server-server/root_password_again password 'unused'
-percona-server-server-5.7 percona-server-server-5.7/root-pass password 'unused'
-percona-server-server-5.7 percona-server-server-5.7/re-root-pass password 'unused'
-EOF
-    ;;
 percona80)
     debconf-set-selections <<EOF
 debconf debconf/frontend select Noninteractive