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