upgrade docker to go1.17.9

Signed-off-by: Florent Poinsard <[email protected]>

Makefile

@@ -244,7 +244,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
 # This rule builds the bootstrap images for all flavors.
 DOCKER_IMAGES_FOR_TEST = mariadb mariadb103 mysql56 mysql57 mysql80 percona percona57 percona80
 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
-BOOTSTRAP_VERSION=4
+BOOTSTRAP_VERSION=4.1
 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

docker/base/Dockerfile

@@ -21,7 +21,7 @@
 # TODO(mberlin): Remove the symlink and this note once
 # https://github.com/docker/hub-feedback/issues/292 is fixed.
 
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}"

docker/base/Dockerfile.mariadb

@@ -1,4 +1,4 @@
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb"
 
 FROM "${image}"

docker/base/Dockerfile.mariadb103

@@ -1,4 +1,4 @@
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103"
 
 FROM "${image}"

docker/base/Dockerfile.mysql56

@@ -1,4 +1,4 @@
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql56"
 
 FROM "${image}"

docker/base/Dockerfile.mysql80

@@ -1,4 +1,4 @@
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"
 
 FROM "${image}"

docker/base/Dockerfile.percona

@@ -1,4 +1,4 @@
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-percona"
 
 FROM "${image}"

docker/base/Dockerfile.percona57

@@ -1,4 +1,4 @@
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-percona57"
 
 FROM "${image}"

docker/base/Dockerfile.percona80

@@ -1,4 +1,4 @@
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-percona80"
 
 FROM "${image}"

docker/bootstrap/Dockerfile.common

@@ -1,4 +1,4 @@
-FROM golang:1.17-buster
+FROM golang:1.17.9-buster
 
 # Install Vitess build dependencies
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

docker/bootstrap/Dockerfile.mysql56

@@ -3,15 +3,11 @@ ARG image="vitess/bootstrap:${bootstrap_version}-common"
 
 FROM "${image}"
 
-# Install MySQL 5.6
-#
-# Unfortunately we need to keep the 'stretch' repo from Oracle as there's no official support
-# for MySQL 5.6 for Debian Buster: https://bugs.mysql.com/bug.php?id=101055
-#
-# I think it's fine as MySQL 5.6 will be EOL pretty soon (February 5, 2021)
-#
-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 && \
+# Install MySQL 5.6. This version of MySQL is completely EOL by Oracle, and hence the upstream
+# APT repositories are no longer signed. We need to use `--allow-insecure-repositories` when updating
+# and `--allow-unauthenticated` for installing, otherwise APT will refuse to install the unsigned packages.
+# TODO@vmg: remove the mysql56 image altogether
+RUN 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/ stretch mysql-5.6' && \
     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 && \
@@ -20,8 +16,8 @@ RUN for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver keyser
         echo percona-server-server-5.6 percona-server-server/root_password password 'unused'; \
         echo percona-server-server-5.6 percona-server-server/root_password_again password 'unused'; \
     } | debconf-set-selections && \
-    apt-get update -y && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \
+    apt-get update -y --allow-insecure-repositories && \
+    DEBIAN_FRONTEND=noninteractive apt-get install --allow-unauthenticated -y mysql-server libmysqlclient-dev libdbd-mysql-perl rsync libev4 percona-xtrabackup-24 && \
     rm -rf /var/lib/apt/lists/*
 
 # Bootstrap Vitess

docker/bootstrap/Dockerfile.mysql57

@@ -5,7 +5,6 @@ FROM "${image}"
 
 # Install MySQL 5.7
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg dirmngr ca-certificates && \
-    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-5.7' && \
     for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \

docker/lite/Dockerfile.alpine

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.mariadb

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.mariadb103

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.mysql56

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql56"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.mysql57

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.mysql80

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.percona

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-percona"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.percona57

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-percona57"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.percona80

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-percona80"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.testing

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.ubi7.mysql57

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.ubi7.mysql80

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.ubi7.percona57

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-percona57"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.ubi7.percona80

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-percona80"
 
 FROM "${image}" AS builder

docker/local/Dockerfile

@@ -1,4 +1,4 @@
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-common"
 
 FROM "${image}"

docker/vttestserver/Dockerfile.mysql57

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}" AS builder

docker/vttestserver/Dockerfile.mysql80

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"
 
 FROM "${image}" AS builder

test/templates/dockerfile.tpl

@@ -1,4 +1,4 @@
-ARG bootstrap_version=4
+ARG bootstrap_version=4.1
 ARG image="vitess/bootstrap:${bootstrap_version}-{{.Platform}}"
 
 FROM "${image}"