From 42e357b79dca66ce7c7944b65fbcc7ae9c6bbe43 Mon Sep 17 00:00:00 2001 From: Mihran Minasyan <> Date: Wed, 26 Feb 2020 18:16:54 +0400 Subject: [PATCH 1/4] Change from "Docker" to "Docker-Moby" for readme --- images/linux/scripts/installers/docker-moby.sh | 2 +- images/linux/scripts/installers/docker.sh | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 625c93cfa..cb166a4b6 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -40,4 +40,4 @@ fi ## Add version information to the metadata file echo "Documenting Docker version" docker_version=$(docker -v) -DocumentInstalledItem "Docker ($docker_version)" +DocumentInstalledItem "Docker-Moby ($docker_version)" diff --git a/images/linux/scripts/installers/docker.sh b/images/linux/scripts/installers/docker.sh index b7fb84e6a..643d17861 100644 --- a/images/linux/scripts/installers/docker.sh +++ b/images/linux/scripts/installers/docker.sh @@ -26,9 +26,4 @@ docker pull debian:9 docker pull alpine:3.7 docker pull alpine:3.8 docker pull alpine:3.9 -docker pull alpine:3.10 - -## Add version information to the metadata file -echo "Documenting Docker version" -DOCKER_VERSION=`docker -v` -DocumentInstalledItem "Docker ($DOCKER_VERSION)" +docker pull alpine:3.10 \ No newline at end of file From 699e797368ab93e7468e9ab6f57914e53739d616 Mon Sep 17 00:00:00 2001 From: Mihran Minasyan <> Date: Wed, 26 Feb 2020 22:18:58 +0400 Subject: [PATCH 2/4] Delete docker.sh Deleted docker.sh, because its do the same thing --- .../linux/scripts/installers/docker-moby.sh | 12 ++++++++ images/linux/scripts/installers/docker.sh | 29 ------------------- 2 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 images/linux/scripts/installers/docker.sh diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index cb166a4b6..90eb04c33 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -37,6 +37,18 @@ else set +e fi +docker pull node:10 +docker pull node:12 +docker pull buildpack-deps:stretch +docker pull node:10-alpine +docker pull node:12-alpine +docker pull debian:8 +docker pull debian:9 +docker pull alpine:3.7 +docker pull alpine:3.8 +docker pull alpine:3.9 +docker pull alpine:3.10 + ## Add version information to the metadata file echo "Documenting Docker version" docker_version=$(docker -v) diff --git a/images/linux/scripts/installers/docker.sh b/images/linux/scripts/installers/docker.sh deleted file mode 100644 index 643d17861..000000000 --- a/images/linux/scripts/installers/docker.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -################################################################################ -## File: docker.sh -## Desc: Installs the correct version of docker onto the image, and pulls -## down the default docker image used for building on ubuntu -################################################################################ - -source $HELPER_SCRIPTS/apt.sh -source $HELPER_SCRIPTS/document.sh - -DOCKER_PACKAGE=moby - -apt-get remove -y moby-engine mobi-cli -apt-get update -apt-get install -y apt-transport-https ca-certificates curl software-properties-common -apt-get update -apt-get install -y moby-engine mobi-cli - -docker pull node:10 -docker pull node:12 -docker pull buildpack-deps:stretch -docker pull node:10-alpine -docker pull node:12-alpine -docker pull debian:8 -docker pull debian:9 -docker pull alpine:3.7 -docker pull alpine:3.8 -docker pull alpine:3.9 -docker pull alpine:3.10 \ No newline at end of file From 990b479e44064c74d76104de19df987aff6294cf Mon Sep 17 00:00:00 2001 From: Mihran Minasyan <> Date: Thu, 27 Feb 2020 16:55:23 +0400 Subject: [PATCH 3/4] Minor bug fix --- images/linux/scripts/installers/docker-moby.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 312be56fd..b9d43b546 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ -## File: docker-ce.sh -## Desc: Installs docker onto the image, but does not pre-pull any images +## File: docker-moby.sh +## Desc: Installs docker onto the image ################################################################################ source $HELPER_SCRIPTS/apt.sh From f0e4d780060478aa6aa178ba7dc7335eb7ec0f1a Mon Sep 17 00:00:00 2001 From: Mihran Minasyan <> Date: Thu, 27 Feb 2020 19:14:40 +0400 Subject: [PATCH 4/4] Deleted docker.sh from ubuntu jsons --- images/linux/ubuntu1604.json | 1 - images/linux/ubuntu1804.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index e303746be..155814caa 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -130,7 +130,6 @@ "{{template_dir}}/scripts/installers/cmake.sh", "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", - "{{template_dir}}/scripts/installers/docker.sh", "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 1492d4b54..884e6769e 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -133,7 +133,6 @@ "{{template_dir}}/scripts/installers/cmake.sh", "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", - "{{template_dir}}/scripts/installers/docker.sh", "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh",