Skip to content

Commit b2e29ef

Browse files
authored
Merge pull request #295 from thaJeztah/add_buildx_package
install docker-buildx-plugin on >= 22.06 (test channel only currently)
2 parents ed679a8 + df6b692 commit b2e29ef

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

install.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,10 @@ do_install() {
444444
# also install the latest version of the "docker scan" cli-plugin (only supported on x86 currently)
445445
pkgs="$pkgs docker-scan-plugin"
446446
fi
447+
# TODO(thaJeztah) remove the $CHANNEL check once 22.06 and docker-buildx-plugin is published to the "stable" channel
448+
if [ "$CHANNEL" = "test" ] && version_gte "22.06"; then
449+
pkgs="$pkgs docker-buildx-plugin"
450+
fi
447451
if ! is_dry_run; then
448452
set -x
449453
fi
@@ -536,6 +540,10 @@ do_install() {
536540
if version_gte "20.10"; then
537541
pkgs="$pkgs docker-compose-plugin docker-ce-rootless-extras$pkg_version"
538542
fi
543+
# TODO(thaJeztah) remove the $CHANNEL check once 22.06 and docker-buildx-plugin is published to the "stable" channel
544+
if [ "$CHANNEL" = "test" ] && version_gte "22.06"; then
545+
pkgs="$pkgs docker-buildx-plugin"
546+
fi
539547
if ! is_dry_run; then
540548
set -x
541549
fi
@@ -616,6 +624,10 @@ do_install() {
616624
if version_gte "20.10"; then
617625
pkgs="$pkgs docker-compose-plugin docker-ce-rootless-extras$pkg_version"
618626
fi
627+
# TODO(thaJeztah) remove the $CHANNEL check once 22.06 and docker-buildx-plugin is published to the "stable" channel
628+
if [ "$CHANNEL" = "test" ] && version_gte "22.06"; then
629+
pkgs="$pkgs docker-buildx-plugin"
630+
fi
619631
if ! is_dry_run; then
620632
set -x
621633
fi

rootless-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if [ -z "$CHANNEL" ]; then
3030
fi
3131
# The latest release is currently hard-coded.
3232
STABLE_LATEST="20.10.17"
33-
TEST_LATEST="20.10.17"
33+
TEST_LATEST="22.06.0-beta.0"
3434
STATIC_RELEASE_URL=
3535
STATIC_RELEASE_ROOTLESS_URL=
3636
case "$CHANNEL" in

0 commit comments

Comments
 (0)