actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-20 06:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #470 from m-minasyan/v-mimina/docker-moby-version-fix

Browse Source 
Change documenting of Docker version
This commit is contained in:
Alejandro Pauly
2020-02-28 08:06:40 -05:00
committed by GitHub
parent 621de762d8 f0e4d78006
commit 7e9c3ca728
4 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
images/linux/scripts/installers/docker-moby.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
################################################################################ ################################################################################
## File: docker-ce.sh ## File: docker-moby.sh
## Desc: Installs docker onto the image, but does not pre-pull any images ## Desc: Installs docker onto the image
################################################################################ ################################################################################
source $HELPER_SCRIPTS/apt.sh source $HELPER_SCRIPTS/apt.sh
@@ -33,7 +33,19 @@ else
set +e set +e
fi 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 ## Add version information to the metadata file
echo "Documenting Docker version" echo "Documenting Docker version"
docker_version=$(docker -v) docker_version=$(docker -v)
DocumentInstalledItem "Docker ($docker_version)" DocumentInstalledItem "Docker-Moby ($docker_version)"

32
images/linux/scripts/installers/docker.sh
View File

@@ -1,32 +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 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
## Add version information to the metadata file
echo "Documenting Docker version"
DOCKER_VERSION=`docker -v`
DocumentInstalledItem "Docker ($DOCKER_VERSION)"

1
images/linux/ubuntu1604.json
View File

@@ -131,7 +131,6 @@
"{{template_dir}}/scripts/installers/cmake.sh", "{{template_dir}}/scripts/installers/cmake.sh",
"{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-compose.sh",
"{{template_dir}}/scripts/installers/docker-moby.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/dotnetcore-sdk.sh",
"{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/erlang.sh",
"{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/firefox.sh",

1
images/linux/ubuntu1804.json
View File

@@ -134,7 +134,6 @@
"{{template_dir}}/scripts/installers/cmake.sh", "{{template_dir}}/scripts/installers/cmake.sh",
"{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-compose.sh",
"{{template_dir}}/scripts/installers/docker-moby.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/dotnetcore-sdk.sh",
"{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/erlang.sh",
"{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/firefox.sh",