From 31bc2ccae9ded22bf088c0791d7ec9f47c46ced8 Mon Sep 17 00:00:00 2001 From: Derek Perkins Date: Tue, 25 Jan 2022 15:09:09 -0700 Subject: [PATCH 1/3] docker: rm pmm-client & orchestrator from release Signed-off-by: Derek Perkins --- docker/release.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/docker/release.sh b/docker/release.sh index ffdd994f301..33f9b364266 100755 --- a/docker/release.sh +++ b/docker/release.sh @@ -2,8 +2,6 @@ set -ex vt_base_version='v7.0.2' -orchestrator_version='3.2.3' -pmm_client_version='1.17.4' docker pull vitess/base:$vt_base_version @@ -62,12 +60,3 @@ docker tag vitess/logtail:$vt_base_version-buster vitess/logtail:$vt_base_versio docker push vitess/logtail:$vt_base_version-buster docker push vitess/logtail:$vt_base_version -docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg PMM_CLIENT_VER=$pmm_client_version -t vitess/pmm-client:v$pmm_client_version-buster pmm-client -docker tag vitess/pmm-client:v$pmm_client_version-buster vitess/pmm-client:v$pmm_client_version -docker push vitess/pmm-client:v$pmm_client_version-buster -docker push vitess/pmm-client:v$pmm_client_version - -docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg ORC_VER=$orchestrator_version -t vitess/orchestrator:v$orchestrator_version-buster orchestrator -docker tag vitess/orchestrator:v$orchestrator_version-buster vitess/orchestrator:v$orchestrator_version -docker push vitess/orchestrator:v$orchestrator_version-buster -docker push vitess/orchestrator:v$orchestrator_version From e361b30b2f018a5b5c1db2bb0d7fece1756829b3 Mon Sep 17 00:00:00 2001 From: Derek Perkins Date: Tue, 25 Jan 2022 15:16:49 -0700 Subject: [PATCH 2/3] docker: start publishing bullseye images Signed-off-by: Derek Perkins --- docker/k8s/Dockerfile | 3 +- docker/k8s/logrotate/Dockerfile | 4 +- docker/k8s/logtail/Dockerfile | 4 +- docker/k8s/mysqlctl/Dockerfile | 3 +- docker/k8s/mysqlctld/Dockerfile | 3 +- docker/k8s/orchestrator/Dockerfile | 4 +- docker/k8s/pmm-client/Dockerfile | 4 +- docker/k8s/vtbackup/Dockerfile | 4 +- docker/k8s/vtctl/Dockerfile | 3 +- docker/k8s/vtctlclient/Dockerfile | 3 +- docker/k8s/vtctld/Dockerfile | 3 +- docker/k8s/vtexplain/Dockerfile | 3 +- docker/k8s/vtgate/Dockerfile | 3 +- docker/k8s/vttablet/Dockerfile | 3 +- docker/k8s/vtworker/Dockerfile | 3 +- docker/release.sh | 116 +++++++++++++++-------------- 16 files changed, 96 insertions(+), 70 deletions(-) diff --git a/docker/k8s/Dockerfile b/docker/k8s/Dockerfile index ea736822a7a..1d675923e7f 100644 --- a/docker/k8s/Dockerfile +++ b/docker/k8s/Dockerfile @@ -13,10 +13,11 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim FROM vitess/base:${VT_BASE_VER} AS base -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} # TODO: remove when https://github.com/vitessio/vitess/issues/3553 is fixed RUN apt-get update && \ diff --git a/docker/k8s/logrotate/Dockerfile b/docker/k8s/logrotate/Dockerfile index 0d63e97fce4..903becdcf3f 100644 --- a/docker/k8s/logrotate/Dockerfile +++ b/docker/k8s/logrotate/Dockerfile @@ -12,7 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM debian:buster-slim +ARG DEBIAN_VER=buster-slim + +FROM debian:${DEBIAN_VER} ADD logrotate.conf /vt/logrotate.conf diff --git a/docker/k8s/logtail/Dockerfile b/docker/k8s/logtail/Dockerfile index eca4775a135..52e28c0eda9 100644 --- a/docker/k8s/logtail/Dockerfile +++ b/docker/k8s/logtail/Dockerfile @@ -12,7 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM debian:buster-slim +ARG DEBIAN_VER=buster-slim + +FROM debian:${DEBIAN_VER} ENV TAIL_FILEPATH /dev/null diff --git a/docker/k8s/mysqlctl/Dockerfile b/docker/k8s/mysqlctl/Dockerfile index 45abdfda5dc..8b8588bd420 100644 --- a/docker/k8s/mysqlctl/Dockerfile +++ b/docker/k8s/mysqlctl/Dockerfile @@ -13,10 +13,11 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} # Set up Vitess environment (just enough to run pre-built Go binaries) ENV VTROOT /vt diff --git a/docker/k8s/mysqlctld/Dockerfile b/docker/k8s/mysqlctld/Dockerfile index ff1ddc1215a..8e4513cf934 100644 --- a/docker/k8s/mysqlctld/Dockerfile +++ b/docker/k8s/mysqlctld/Dockerfile @@ -13,10 +13,11 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} RUN apt-get update && \ apt-get upgrade -qq && \ diff --git a/docker/k8s/orchestrator/Dockerfile b/docker/k8s/orchestrator/Dockerfile index a56a2295cd8..453571d0646 100644 --- a/docker/k8s/orchestrator/Dockerfile +++ b/docker/k8s/orchestrator/Dockerfile @@ -13,9 +13,11 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim + FROM vitess/k8s:${VT_BASE_VER} AS k8s -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} ARG ORC_VER='3.2.3' RUN apt-get update && \ diff --git a/docker/k8s/pmm-client/Dockerfile b/docker/k8s/pmm-client/Dockerfile index 4fb986a8b7c..3938a53949d 100644 --- a/docker/k8s/pmm-client/Dockerfile +++ b/docker/k8s/pmm-client/Dockerfile @@ -13,9 +13,11 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim + FROM vitess/k8s:${VT_BASE_VER} AS k8s -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} ARG PMM_CLIENT_VER='1.17.4' RUN apt-get update && \ diff --git a/docker/k8s/vtbackup/Dockerfile b/docker/k8s/vtbackup/Dockerfile index 2768017e247..1dd18a1bbbc 100644 --- a/docker/k8s/vtbackup/Dockerfile +++ b/docker/k8s/vtbackup/Dockerfile @@ -13,10 +13,12 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim + FROM vitess/k8s:${VT_BASE_VER} AS k8s -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} # Set up Vitess environment (just enough to run pre-built Go binaries) ENV VTROOT /vt diff --git a/docker/k8s/vtctl/Dockerfile b/docker/k8s/vtctl/Dockerfile index 2d9c717a9c5..71d406e5a83 100644 --- a/docker/k8s/vtctl/Dockerfile +++ b/docker/k8s/vtctl/Dockerfile @@ -13,10 +13,11 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} # Set up Vitess environment (just enough to run pre-built Go binaries) ENV VTROOT /vt diff --git a/docker/k8s/vtctlclient/Dockerfile b/docker/k8s/vtctlclient/Dockerfile index 5ed9ba0d613..fc8a502f52b 100644 --- a/docker/k8s/vtctlclient/Dockerfile +++ b/docker/k8s/vtctlclient/Dockerfile @@ -13,10 +13,11 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} RUN apt-get update && \ apt-get upgrade -qq && \ diff --git a/docker/k8s/vtctld/Dockerfile b/docker/k8s/vtctld/Dockerfile index cc64990c05f..04236875a6d 100644 --- a/docker/k8s/vtctld/Dockerfile +++ b/docker/k8s/vtctld/Dockerfile @@ -13,10 +13,11 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} # Set up Vitess environment (just enough to run pre-built Go binaries) ENV VTROOT /vt diff --git a/docker/k8s/vtexplain/Dockerfile b/docker/k8s/vtexplain/Dockerfile index 45c7b7ec781..4e5d0a80b76 100644 --- a/docker/k8s/vtexplain/Dockerfile +++ b/docker/k8s/vtexplain/Dockerfile @@ -13,10 +13,11 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim FROM vitess/base:${VT_BASE_VER} AS base -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} # Set up Vitess environment (just enough to run pre-built Go binaries) ENV VTROOT /vt diff --git a/docker/k8s/vtgate/Dockerfile b/docker/k8s/vtgate/Dockerfile index 5f5bee0fade..08d5a898577 100644 --- a/docker/k8s/vtgate/Dockerfile +++ b/docker/k8s/vtgate/Dockerfile @@ -13,10 +13,11 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} # Set up Vitess environment (just enough to run pre-built Go binaries) ENV VTROOT /vt diff --git a/docker/k8s/vttablet/Dockerfile b/docker/k8s/vttablet/Dockerfile index fefd0dfa506..d2b5946ddd8 100644 --- a/docker/k8s/vttablet/Dockerfile +++ b/docker/k8s/vttablet/Dockerfile @@ -13,10 +13,11 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} # TODO: remove when https://github.com/vitessio/vitess/issues/3553 is fixed RUN apt-get update && \ diff --git a/docker/k8s/vtworker/Dockerfile b/docker/k8s/vtworker/Dockerfile index b5628b0d69a..76c91fb9901 100644 --- a/docker/k8s/vtworker/Dockerfile +++ b/docker/k8s/vtworker/Dockerfile @@ -13,10 +13,11 @@ # limitations under the License. ARG VT_BASE_VER=latest +ARG DEBIAN_VER=buster-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s -FROM debian:buster-slim +FROM debian:${DEBIAN_VER} # Set up Vitess environment (just enough to run pre-built Go binaries) ENV VTROOT /vt diff --git a/docker/release.sh b/docker/release.sh index 33f9b364266..1d3f8a67a94 100755 --- a/docker/release.sh +++ b/docker/release.sh @@ -1,62 +1,68 @@ #!/bin/bash set -ex -vt_base_version='v7.0.2' +vt_base_version='v12.0.3' +debian_versions='buster bullseye' +default_debian_version='buster' docker pull vitess/base:$vt_base_version -docker build --build-arg VT_BASE_VER=$vt_base_version -t vitess/k8s:$vt_base_version-buster . -docker tag vitess/k8s:$vt_base_version-buster vitess/k8s:$vt_base_version -docker push vitess/k8s:$vt_base_version-buster -docker push vitess/k8s:$vt_base_version - -docker build --build-arg VT_BASE_VER=$vt_base_version -t vitess/vtgate:$vt_base_version-buster vtgate -docker tag vitess/vtgate:$vt_base_version-buster vitess/vtgate:$vt_base_version -docker push vitess/vtgate:$vt_base_version-buster -docker push vitess/vtgate:$vt_base_version - -docker build --build-arg VT_BASE_VER=$vt_base_version -t vitess/vttablet:$vt_base_version-buster vttablet -docker tag vitess/vttablet:$vt_base_version-buster vitess/vttablet:$vt_base_version -docker push vitess/vttablet:$vt_base_version-buster -docker push vitess/vttablet:$vt_base_version - -docker build --build-arg VT_BASE_VER=$vt_base_version -t vitess/mysqlctld:$vt_base_version-buster mysqlctld -docker tag vitess/mysqlctld:$vt_base_version-buster vitess/mysqlctld:$vt_base_version -docker push vitess/mysqlctld:$vt_base_version-buster -docker push vitess/mysqlctld:$vt_base_version - -docker build --build-arg VT_BASE_VER=$vt_base_version -t vitess/mysqlctl:$vt_base_version-buster mysqlctl -docker tag vitess/mysqlctl:$vt_base_version-buster vitess/mysqlctl:$vt_base_version -docker push vitess/mysqlctl:$vt_base_version-buster -docker push vitess/mysqlctl:$vt_base_version - -docker build --build-arg VT_BASE_VER=$vt_base_version -t vitess/vtctl:$vt_base_version-buster vtctl -docker tag vitess/vtctl:$vt_base_version-buster vitess/vtctl:$vt_base_version -docker push vitess/vtctl:$vt_base_version-buster -docker push vitess/vtctl:$vt_base_version - -docker build --build-arg VT_BASE_VER=$vt_base_version -t vitess/vtctlclient:$vt_base_version-buster vtctlclient -docker tag vitess/vtctlclient:$vt_base_version-buster vitess/vtctlclient:$vt_base_version -docker push vitess/vtctlclient:$vt_base_version-buster -docker push vitess/vtctlclient:$vt_base_version - -docker build --build-arg VT_BASE_VER=$vt_base_version -t vitess/vtctld:$vt_base_version-buster vtctld -docker tag vitess/vtctld:$vt_base_version-buster vitess/vtctld:$vt_base_version -docker push vitess/vtctld:$vt_base_version-buster -docker push vitess/vtctld:$vt_base_version - -docker build --build-arg VT_BASE_VER=$vt_base_version -t vitess/vtworker:$vt_base_version-buster vtworker -docker tag vitess/vtworker:$vt_base_version-buster vitess/vtworker:$vt_base_version -docker push vitess/vtworker:$vt_base_version-buster -docker push vitess/vtworker:$vt_base_version - -docker build --build-arg VT_BASE_VER=$vt_base_version -t vitess/logrotate:$vt_base_version-buster logrotate -docker tag vitess/logrotate:$vt_base_version-buster vitess/logrotate:$vt_base_version -docker push vitess/logrotate:$vt_base_version-buster -docker push vitess/logrotate:$vt_base_version - -docker build --build-arg VT_BASE_VER=$vt_base_version -t vitess/logtail:$vt_base_version-buster logtail -docker tag vitess/logtail:$vt_base_version-buster vitess/logtail:$vt_base_version -docker push vitess/logtail:$vt_base_version-buster -docker push vitess/logtail:$vt_base_version +for debian_version in $debian_versions +do + echo "####### Building vitess/vt:$debian_version" + docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/k8s:$vt_base_version-$debian_version . + docker tag vitess/k8s:$vt_base_version-$debian_version vitess/k8s:$vt_base_version + docker push vitess/k8s:$vt_base_version-$debian_version + if [ $debian_version = $default_debian_version ]; then docker push vitess/k8s:$vt_base_version; fi + + docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/vtgate:$vt_base_version-$debian_version vtgate + docker tag vitess/vtgate:$vt_base_version-$debian_version vitess/vtgate:$vt_base_version + docker push vitess/vtgate:$vt_base_version-$debian_version + if [ $debian_version = $default_debian_version ]; then docker push vitess/vtgate:$vt_base_version; fi + + docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/vttablet:$vt_base_version-$debian_version vttablet + docker tag vitess/vttablet:$vt_base_version-$debian_version vitess/vttablet:$vt_base_version + docker push vitess/vttablet:$vt_base_version-$debian_version + if [ $debian_version = $default_debian_version ]; then docker push vitess/vttablet:$vt_base_version; fi + + docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/mysqlctld:$vt_base_version-$debian_version mysqlctld + docker tag vitess/mysqlctld:$vt_base_version-$debian_version vitess/mysqlctld:$vt_base_version + docker push vitess/mysqlctld:$vt_base_version-$debian_version + if [ $debian_version = $default_debian_version ]; then docker push vitess/mysqlctld:$vt_base_version; fi + + docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/mysqlctl:$vt_base_version-$debian_version mysqlctl + docker tag vitess/mysqlctl:$vt_base_version-$debian_version vitess/mysqlctl:$vt_base_version + docker push vitess/mysqlctl:$vt_base_version-$debian_version + if [ $debian_version = $default_debian_version ]; then docker push vitess/mysqlctl:$vt_base_version; fi + + docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/vtctl:$vt_base_version-$debian_version vtctl + docker tag vitess/vtctl:$vt_base_version-$debian_version vitess/vtctl:$vt_base_version + docker push vitess/vtctl:$vt_base_version-$debian_version + if [ $debian_version = $default_debian_version ]; then docker push vitess/vtctl:$vt_base_version; fi + + docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/vtctlclient:$vt_base_version-$debian_version vtctlclient + docker tag vitess/vtctlclient:$vt_base_version-$debian_version vitess/vtctlclient:$vt_base_version + docker push vitess/vtctlclient:$vt_base_version-$debian_version + if [ $debian_version = $default_debian_version ]; then docker push vitess/vtctlclient:$vt_base_version; fi + + docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/vtctld:$vt_base_version-$debian_version vtctld + docker tag vitess/vtctld:$vt_base_version-$debian_version vitess/vtctld:$vt_base_version + docker push vitess/vtctld:$vt_base_version-$debian_version + if [ $debian_version = $default_debian_version ]; then docker push vitess/vtctld:$vt_base_version; fi + + docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/vtworker:$vt_base_version-$debian_version vtworker + docker tag vitess/vtworker:$vt_base_version-$debian_version vitess/vtworker:$vt_base_version + docker push vitess/vtworker:$vt_base_version-$debian_version + if [ $debian_version = $default_debian_version ]; then docker push vitess/vtworker:$vt_base_version; fi + + docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/logrotate:$vt_base_version-$debian_version logrotate + docker tag vitess/logrotate:$vt_base_version-$debian_version vitess/logrotate:$vt_base_version + docker push vitess/logrotate:$vt_base_version-$debian_version + if [ $debian_version = $default_debian_version ]; then docker push vitess/logrotate:$vt_base_version; fi + + docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/logtail:$vt_base_version-$debian_version logtail + docker tag vitess/logtail:$vt_base_version-$debian_version vitess/logtail:$vt_base_version + docker push vitess/logtail:$vt_base_version-$debian_version + if [ $debian_version = $default_debian_version ]; then docker push vitess/logtail:$vt_base_version; fi +done From e8bf16189da1234286502ffd3a9161e34a70d3b7 Mon Sep 17 00:00:00 2001 From: Derek Perkins Date: Thu, 27 Jan 2022 23:30:27 -0700 Subject: [PATCH 3/3] docker: review fixes Signed-off-by: Derek Perkins --- docker/k8s/Dockerfile | 2 +- docker/k8s/logrotate/Dockerfile | 2 +- docker/k8s/logtail/Dockerfile | 2 +- docker/k8s/mysqlctl/Dockerfile | 2 +- docker/k8s/mysqlctld/Dockerfile | 2 +- docker/k8s/orchestrator/Dockerfile | 2 +- docker/k8s/pmm-client/Dockerfile | 2 +- docker/k8s/vtbackup/Dockerfile | 2 +- docker/k8s/vtctl/Dockerfile | 2 +- docker/k8s/vtctlclient/Dockerfile | 2 +- docker/k8s/vtctld/Dockerfile | 2 +- docker/k8s/vtexplain/Dockerfile | 2 +- docker/k8s/vtgate/Dockerfile | 2 +- docker/k8s/vttablet/Dockerfile | 2 +- docker/k8s/vtworker/Dockerfile | 2 +- docker/release.sh | 22 +++++++++++----------- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/docker/k8s/Dockerfile b/docker/k8s/Dockerfile index 1d675923e7f..5f9c5ff672a 100644 --- a/docker/k8s/Dockerfile +++ b/docker/k8s/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/base:${VT_BASE_VER} AS base diff --git a/docker/k8s/logrotate/Dockerfile b/docker/k8s/logrotate/Dockerfile index 903becdcf3f..f23c282660c 100644 --- a/docker/k8s/logrotate/Dockerfile +++ b/docker/k8s/logrotate/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM debian:${DEBIAN_VER} diff --git a/docker/k8s/logtail/Dockerfile b/docker/k8s/logtail/Dockerfile index 52e28c0eda9..adf195201a3 100644 --- a/docker/k8s/logtail/Dockerfile +++ b/docker/k8s/logtail/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM debian:${DEBIAN_VER} diff --git a/docker/k8s/mysqlctl/Dockerfile b/docker/k8s/mysqlctl/Dockerfile index 8b8588bd420..6c449552354 100644 --- a/docker/k8s/mysqlctl/Dockerfile +++ b/docker/k8s/mysqlctl/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s diff --git a/docker/k8s/mysqlctld/Dockerfile b/docker/k8s/mysqlctld/Dockerfile index 8e4513cf934..6fdb30f012a 100644 --- a/docker/k8s/mysqlctld/Dockerfile +++ b/docker/k8s/mysqlctld/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s diff --git a/docker/k8s/orchestrator/Dockerfile b/docker/k8s/orchestrator/Dockerfile index 453571d0646..e3e8f3ac346 100644 --- a/docker/k8s/orchestrator/Dockerfile +++ b/docker/k8s/orchestrator/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s diff --git a/docker/k8s/pmm-client/Dockerfile b/docker/k8s/pmm-client/Dockerfile index 3938a53949d..732e2e0a2ee 100644 --- a/docker/k8s/pmm-client/Dockerfile +++ b/docker/k8s/pmm-client/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s diff --git a/docker/k8s/vtbackup/Dockerfile b/docker/k8s/vtbackup/Dockerfile index 1dd18a1bbbc..4a8b3be9d52 100644 --- a/docker/k8s/vtbackup/Dockerfile +++ b/docker/k8s/vtbackup/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s diff --git a/docker/k8s/vtctl/Dockerfile b/docker/k8s/vtctl/Dockerfile index 71d406e5a83..cce3b6dc63c 100644 --- a/docker/k8s/vtctl/Dockerfile +++ b/docker/k8s/vtctl/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s diff --git a/docker/k8s/vtctlclient/Dockerfile b/docker/k8s/vtctlclient/Dockerfile index fc8a502f52b..17eab700eb4 100644 --- a/docker/k8s/vtctlclient/Dockerfile +++ b/docker/k8s/vtctlclient/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s diff --git a/docker/k8s/vtctld/Dockerfile b/docker/k8s/vtctld/Dockerfile index 04236875a6d..5daaf929486 100644 --- a/docker/k8s/vtctld/Dockerfile +++ b/docker/k8s/vtctld/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s diff --git a/docker/k8s/vtexplain/Dockerfile b/docker/k8s/vtexplain/Dockerfile index 4e5d0a80b76..fb2f375d41c 100644 --- a/docker/k8s/vtexplain/Dockerfile +++ b/docker/k8s/vtexplain/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/base:${VT_BASE_VER} AS base diff --git a/docker/k8s/vtgate/Dockerfile b/docker/k8s/vtgate/Dockerfile index 08d5a898577..3829227e2fa 100644 --- a/docker/k8s/vtgate/Dockerfile +++ b/docker/k8s/vtgate/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s diff --git a/docker/k8s/vttablet/Dockerfile b/docker/k8s/vttablet/Dockerfile index d2b5946ddd8..95453a69771 100644 --- a/docker/k8s/vttablet/Dockerfile +++ b/docker/k8s/vttablet/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s diff --git a/docker/k8s/vtworker/Dockerfile b/docker/k8s/vtworker/Dockerfile index 76c91fb9901..c2d7becb03d 100644 --- a/docker/k8s/vtworker/Dockerfile +++ b/docker/k8s/vtworker/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG VT_BASE_VER=latest -ARG DEBIAN_VER=buster-slim +ARG DEBIAN_VER=stable-slim FROM vitess/k8s:${VT_BASE_VER} AS k8s diff --git a/docker/release.sh b/docker/release.sh index 1d3f8a67a94..aa4a7bac5f8 100755 --- a/docker/release.sh +++ b/docker/release.sh @@ -14,55 +14,55 @@ do docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/k8s:$vt_base_version-$debian_version . docker tag vitess/k8s:$vt_base_version-$debian_version vitess/k8s:$vt_base_version docker push vitess/k8s:$vt_base_version-$debian_version - if [ $debian_version = $default_debian_version ]; then docker push vitess/k8s:$vt_base_version; fi + if [[ $debian_version == $default_debian_version ]]; then docker push vitess/k8s:$vt_base_version; fi docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/vtgate:$vt_base_version-$debian_version vtgate docker tag vitess/vtgate:$vt_base_version-$debian_version vitess/vtgate:$vt_base_version docker push vitess/vtgate:$vt_base_version-$debian_version - if [ $debian_version = $default_debian_version ]; then docker push vitess/vtgate:$vt_base_version; fi + if [[ $debian_version == $default_debian_version ]]; then docker push vitess/vtgate:$vt_base_version; fi docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/vttablet:$vt_base_version-$debian_version vttablet docker tag vitess/vttablet:$vt_base_version-$debian_version vitess/vttablet:$vt_base_version docker push vitess/vttablet:$vt_base_version-$debian_version - if [ $debian_version = $default_debian_version ]; then docker push vitess/vttablet:$vt_base_version; fi + if [[ $debian_version == $default_debian_version ]]; then docker push vitess/vttablet:$vt_base_version; fi docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/mysqlctld:$vt_base_version-$debian_version mysqlctld docker tag vitess/mysqlctld:$vt_base_version-$debian_version vitess/mysqlctld:$vt_base_version docker push vitess/mysqlctld:$vt_base_version-$debian_version - if [ $debian_version = $default_debian_version ]; then docker push vitess/mysqlctld:$vt_base_version; fi + if [[ $debian_version == $default_debian_version ]]; then docker push vitess/mysqlctld:$vt_base_version; fi docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/mysqlctl:$vt_base_version-$debian_version mysqlctl docker tag vitess/mysqlctl:$vt_base_version-$debian_version vitess/mysqlctl:$vt_base_version docker push vitess/mysqlctl:$vt_base_version-$debian_version - if [ $debian_version = $default_debian_version ]; then docker push vitess/mysqlctl:$vt_base_version; fi + if [[ $debian_version == $default_debian_version ]]; then docker push vitess/mysqlctl:$vt_base_version; fi docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/vtctl:$vt_base_version-$debian_version vtctl docker tag vitess/vtctl:$vt_base_version-$debian_version vitess/vtctl:$vt_base_version docker push vitess/vtctl:$vt_base_version-$debian_version - if [ $debian_version = $default_debian_version ]; then docker push vitess/vtctl:$vt_base_version; fi + if [[ $debian_version == $default_debian_version ]]; then docker push vitess/vtctl:$vt_base_version; fi docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/vtctlclient:$vt_base_version-$debian_version vtctlclient docker tag vitess/vtctlclient:$vt_base_version-$debian_version vitess/vtctlclient:$vt_base_version docker push vitess/vtctlclient:$vt_base_version-$debian_version - if [ $debian_version = $default_debian_version ]; then docker push vitess/vtctlclient:$vt_base_version; fi + if [[ $debian_version == $default_debian_version ]]; then docker push vitess/vtctlclient:$vt_base_version; fi docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/vtctld:$vt_base_version-$debian_version vtctld docker tag vitess/vtctld:$vt_base_version-$debian_version vitess/vtctld:$vt_base_version docker push vitess/vtctld:$vt_base_version-$debian_version - if [ $debian_version = $default_debian_version ]; then docker push vitess/vtctld:$vt_base_version; fi + if [[ $debian_version == $default_debian_version ]]; then docker push vitess/vtctld:$vt_base_version; fi docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/vtworker:$vt_base_version-$debian_version vtworker docker tag vitess/vtworker:$vt_base_version-$debian_version vitess/vtworker:$vt_base_version docker push vitess/vtworker:$vt_base_version-$debian_version - if [ $debian_version = $default_debian_version ]; then docker push vitess/vtworker:$vt_base_version; fi + if [[ $debian_version == $default_debian_version ]]; then docker push vitess/vtworker:$vt_base_version; fi docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/logrotate:$vt_base_version-$debian_version logrotate docker tag vitess/logrotate:$vt_base_version-$debian_version vitess/logrotate:$vt_base_version docker push vitess/logrotate:$vt_base_version-$debian_version - if [ $debian_version = $default_debian_version ]; then docker push vitess/logrotate:$vt_base_version; fi + if [[ $debian_version == $default_debian_version ]]; then docker push vitess/logrotate:$vt_base_version; fi docker build --build-arg VT_BASE_VER=$vt_base_version --build-arg DEBIAN_VER=$debian_version-slim -t vitess/logtail:$vt_base_version-$debian_version logtail docker tag vitess/logtail:$vt_base_version-$debian_version vitess/logtail:$vt_base_version docker push vitess/logtail:$vt_base_version-$debian_version - if [ $debian_version = $default_debian_version ]; then docker push vitess/logtail:$vt_base_version; fi + if [[ $debian_version == $default_debian_version ]]; then docker push vitess/logtail:$vt_base_version; fi done