Skip to content

Commit

Permalink
Merge pull request #295 from thaJeztah/add_buildx_package
Browse files Browse the repository at this point in the history
install docker-buildx-plugin on >= 22.06 (test channel only currently)
  • Loading branch information
thaJeztah authored Jun 7, 2022
2 parents ed679a8 + df6b692 commit b2e29ef
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
12 changes: 12 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rootless-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b2e29ef

Please sign in to comment.