From df6b6926dc796c616cf0b005a752f90ae760873f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 28 May 2022 15:51:43 +0200 Subject: [PATCH] install docker-buildx-plugin on >= 22.06 (test channel only currently) The buildx plugin has moved to a separate package for the 22.06 release. We're currently doing test-builds on staging, so only try to install this when using both the "test" channel and the staging domain. Signed-off-by: Sebastiaan van Stijn --- install.sh | 12 ++++++++++++ rootless-install.sh | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index f040d6e4..143aa4ac 100755 --- a/install.sh +++ b/install.sh @@ -444,6 +444,10 @@ do_install() { # also install the latest version of the "docker scan" cli-plugin (only supported on x86 currently) pkgs="$pkgs docker-scan-plugin" fi + # TODO(thaJeztah) remove the $CHANNEL check once 22.06 and docker-buildx-plugin is published to the "stable" channel + if [ "$CHANNEL" = "test" ] && version_gte "22.06"; then + pkgs="$pkgs docker-buildx-plugin" + fi if ! is_dry_run; then set -x fi @@ -536,6 +540,10 @@ do_install() { if version_gte "20.10"; then pkgs="$pkgs docker-compose-plugin docker-ce-rootless-extras$pkg_version" fi + # TODO(thaJeztah) remove the $CHANNEL check once 22.06 and docker-buildx-plugin is published to the "stable" channel + if [ "$CHANNEL" = "test" ] && version_gte "22.06"; then + pkgs="$pkgs docker-buildx-plugin" + fi if ! is_dry_run; then set -x fi @@ -616,6 +624,10 @@ do_install() { if version_gte "20.10"; then pkgs="$pkgs docker-compose-plugin docker-ce-rootless-extras$pkg_version" fi + # TODO(thaJeztah) remove the $CHANNEL check once 22.06 and docker-buildx-plugin is published to the "stable" channel + if [ "$CHANNEL" = "test" ] && version_gte "22.06"; then + pkgs="$pkgs docker-buildx-plugin" + fi if ! is_dry_run; then set -x fi diff --git a/rootless-install.sh b/rootless-install.sh index 453c3a97..0f821fa8 100755 --- a/rootless-install.sh +++ b/rootless-install.sh @@ -30,7 +30,7 @@ if [ -z "$CHANNEL" ]; then fi # The latest release is currently hard-coded. STABLE_LATEST="20.10.17" -TEST_LATEST="20.10.17" +TEST_LATEST="22.06.0-beta.0" STATIC_RELEASE_URL= STATIC_RELEASE_ROOTLESS_URL= case "$CHANNEL" in