From b372346543caee070b45c7d84e67d7456eddbfff Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Fri, 17 Apr 2020 00:05:31 +0400 Subject: [PATCH 01/10] Moby-buildx installation has been added --- images/linux/scripts/base/repos.sh | 3 +++ images/linux/scripts/installers/docker-moby.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index 4ecd2028c..b1a3aafa2 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -16,4 +16,7 @@ curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg + +curl https://packages.microsoft.com/config/ubuntu/$LSB_RELEASE/multiarch/prod.list > /etc/apt/sources.list.d/microsoft-prod.list + apt-get update \ No newline at end of file diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index b9d43b546..9a9441090 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -16,6 +16,7 @@ if ! IsInstalled $docker_package; then apt-get remove -y moby-engine moby-cli apt-get update apt-get install -y moby-engine moby-cli + apt-get install --no-install-recommends -y moby-buildx else echo "Docker ($docker_package) is already installed" fi From 5cd3d57cf310d8da4a18be24c775e3a463bfef61 Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Fri, 17 Apr 2020 12:49:15 +0400 Subject: [PATCH 02/10] > has been changed to >> --- images/linux/scripts/base/repos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index b1a3aafa2..f4e0d9e5a 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -17,6 +17,6 @@ curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg -curl https://packages.microsoft.com/config/ubuntu/$LSB_RELEASE/multiarch/prod.list > /etc/apt/sources.list.d/microsoft-prod.list +curl https://packages.microsoft.com/config/ubuntu/$LSB_RELEASE/multiarch/prod.list >> /etc/apt/sources.list.d/microsoft-prod.list apt-get update \ No newline at end of file From 348abd0eb26ff900cffc8dc7fd87f432d9dfe672 Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Fri, 17 Apr 2020 13:50:00 +0400 Subject: [PATCH 03/10] additional modification of microsoft-prod.list has been removed --- images/linux/scripts/base/repos.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index f4e0d9e5a..052f97705 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -17,6 +17,4 @@ curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg -curl https://packages.microsoft.com/config/ubuntu/$LSB_RELEASE/multiarch/prod.list >> /etc/apt/sources.list.d/microsoft-prod.list - apt-get update \ No newline at end of file From d2f31e25f5eff232291ac006ba48c91dce588625 Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Fri, 17 Apr 2020 18:06:31 +0400 Subject: [PATCH 04/10] extra space has been removed --- images/linux/scripts/base/repos.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index 052f97705..4ecd2028c 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -16,5 +16,4 @@ curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg - apt-get update \ No newline at end of file From 4729069659385a6cceec2ef1ecf273ad3ea606a0 Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Tue, 21 Apr 2020 15:42:06 +0400 Subject: [PATCH 05/10] Checking the moby-buildx and moby-buildx documentation has been added --- images/linux/scripts/installers/docker-moby.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 4fbbcf657..efa8ea53d 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -26,6 +26,9 @@ echo "Testing to make sure that script performed as expected, and basic scenario if ! command -v docker; then echo "docker was not installed" exit 1 +else if ! command -v docker buildx build then + echo "moby-buildx was not installed" + #exit 1 else # Docker daemon takes time to come up after installing sleep 10 @@ -51,3 +54,7 @@ docker pull ubuntu:14.04 echo "Documenting Docker version" docker_version=$(docker -v) DocumentInstalledItem "Docker-Moby ($docker_version)" + +echo "Documenting moby-buildx version" +moby_buildx_version=$(docker buildx -v) +DocumentInstalledItem "Moby-Buildx ($moby_buildx_version)" From dc52f6110565fa6e357512005c2e4fd2c72b3ec0 Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Tue, 21 Apr 2020 17:24:31 +0400 Subject: [PATCH 06/10] docker-moby.sh bugfixing --- images/linux/scripts/installers/docker-moby.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index efa8ea53d..6548a5578 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -26,7 +26,7 @@ echo "Testing to make sure that script performed as expected, and basic scenario if ! command -v docker; then echo "docker was not installed" exit 1 -else if ! command -v docker buildx build then +elif ! command -v docker buildx build; then echo "moby-buildx was not installed" #exit 1 else From d37793ddc88b003dc0137ba17fe863e86050d62a Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Tue, 21 Apr 2020 23:54:48 +0400 Subject: [PATCH 07/10] Some diagnostic messages have been added --- images/linux/scripts/installers/docker-moby.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 6548a5578..db5c4aff1 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -23,6 +23,7 @@ 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" if ! command -v docker; then echo "docker was not installed" exit 1 @@ -30,6 +31,7 @@ elif ! command -v docker buildx build; then echo "moby-buildx was not installed" #exit 1 else + echo "Docker-moby and moby-buildx checking the successfull" # Docker daemon takes time to come up after installing sleep 10 set -e From 15a96845dd666a039d685e87fd6dfcd4e57dec5c Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Wed, 22 Apr 2020 00:01:16 +0400 Subject: [PATCH 08/10] moby-buildx -> docker-builx --- images/linux/scripts/installers/docker-moby.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index db5c4aff1..620eee0cb 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -28,10 +28,10 @@ if ! command -v docker; then echo "docker was not installed" exit 1 elif ! command -v docker buildx build; then - echo "moby-buildx was not installed" + echo "Docker-buildx was not installed" #exit 1 else - echo "Docker-moby and moby-buildx checking the successfull" + echo "Docker-moby and Docker-buildx checking the successfull" # Docker daemon takes time to come up after installing sleep 10 set -e @@ -57,6 +57,6 @@ echo "Documenting Docker version" docker_version=$(docker -v) DocumentInstalledItem "Docker-Moby ($docker_version)" -echo "Documenting moby-buildx version" -moby_buildx_version=$(docker buildx -v) -DocumentInstalledItem "Moby-Buildx ($moby_buildx_version)" +echo "Documenting Docker-buildx version" +docker_buildx_version=$(docker buildx -v) +DocumentInstalledItem "Docker-Buildx ($docker_buildx_version)" From 32c900900c9cd6f2ffd011d4a8551239a2a07393 Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Wed, 22 Apr 2020 20:36:47 +0400 Subject: [PATCH 09/10] Docker-Buildx version checking has been added --- images/linux/scripts/installers/docker-moby.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 620eee0cb..7d6a832bf 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -23,13 +23,14 @@ 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" +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 ! command -v docker buildx build; then - echo "Docker-buildx was not installed" - #exit 1 +elif ! [ -x "$DOCKER_BUILDX" ]; then + echo "Docker-Buildx was not installed" + exit 1 else echo "Docker-moby and Docker-buildx checking the successfull" # Docker daemon takes time to come up after installing @@ -58,5 +59,6 @@ docker_version=$(docker -v) DocumentInstalledItem "Docker-Moby ($docker_version)" echo "Documenting Docker-buildx version" -docker_buildx_version=$(docker buildx -v) -DocumentInstalledItem "Docker-Buildx ($docker_buildx_version)" +DOCKER_BUILDX_VERSION=$(apt-cache policy moby-buildx | grep Installed) +DOCKER_BUILDX_VERSION=$(echo ${DOCKER_BUILDX_VERSION//Installed:}) +DocumentInstalledItem "Docker-Buildx ($DOCKER_BUILDX_VERSION)" From da3c0fdd69a34c2e8d20594e6a3d3724aa2cc470 Mon Sep 17 00:00:00 2001 From: Andy Mishechkin Date: Thu, 23 Apr 2020 18:41:52 +0400 Subject: [PATCH 10/10] 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)"