From 1cb5c544e2e193bf0465571c1c0c6753503dfe03 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Thu, 2 Feb 2023 21:04:55 +0100 Subject: [PATCH] fix buildx install Signed-off-by: CrazyMax --- install.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index 0ff9da9..163cb78 100755 --- a/install.sh +++ b/install.sh @@ -444,8 +444,7 @@ 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 + if version_gte "23.0"; then pkgs="$pkgs docker-buildx-plugin" fi if ! is_dry_run; then @@ -536,8 +535,7 @@ 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 + if version_gte "23.0"; then pkgs="$pkgs docker-buildx-plugin" fi if ! is_dry_run; then @@ -620,8 +618,7 @@ 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 + if version_gte "23.0"; then pkgs="$pkgs docker-buildx-plugin" fi if ! is_dry_run; then