From da3c0fdd69a34c2e8d20594e6a3d3724aa2cc470 Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Thu, 23 Apr 2020 18:41:52 +0400 Subject: [PATCH] code changing --- images/linux/scripts/installers/docker-moby.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 7d6a832bf..8fe8d1343 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -24,11 +24,10 @@ fi # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" echo "Checking the docker-moby and moby-buildx" -DOCKER_BUILDX=/usr/libexec/docker/cli-plugins/docker-buildx if ! command -v docker; then echo "docker was not installed" exit 1 -elif ! [ -x "$DOCKER_BUILDX" ]; then +elif ! [[ $(docker buildx) ]]; then echo "Docker-Buildx was not installed" exit 1 else @@ -59,6 +58,5 @@ docker_version=$(docker -v) DocumentInstalledItem "Docker-Moby ($docker_version)" echo "Documenting Docker-buildx version" -DOCKER_BUILDX_VERSION=$(apt-cache policy moby-buildx | grep Installed) -DOCKER_BUILDX_VERSION=$(echo ${DOCKER_BUILDX_VERSION//Installed:}) +DOCKER_BUILDX_VERSION=$(docker buildx version | cut -d ' ' -f2) DocumentInstalledItem "Docker-Buildx ($DOCKER_BUILDX_VERSION)"