actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-19 08:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

code changing

Browse Source
This commit is contained in:
Andy Mishechkin
2020-04-23 18:41:52 +04:00
parent 4955402804
commit da3c0fdd69
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,11 +24,10 @@ fi
# Run tests to determine that the software installed as expected # 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 "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 if ! command -v docker; then
echo "docker was not installed" echo "docker was not installed"
exit 1 exit 1
elif ! [ -x "$DOCKER_BUILDX" ]; then elif ! [[ $(docker buildx) ]]; then
echo "Docker-Buildx was not installed" echo "Docker-Buildx was not installed"
exit 1 exit 1
else else
@@ -59,6 +58,5 @@ docker_version=$(docker -v)
DocumentInstalledItem "Docker-Moby ($docker_version)" DocumentInstalledItem "Docker-Moby ($docker_version)"
echo "Documenting Docker-buildx version" echo "Documenting Docker-buildx version"
DOCKER_BUILDX_VERSION=$(apt-cache policy moby-buildx | grep Installed) DOCKER_BUILDX_VERSION=$(docker buildx version | cut -d ' ' -f2)
DOCKER_BUILDX_VERSION=$(echo ${DOCKER_BUILDX_VERSION//Installed:})
DocumentInstalledItem "Docker-Buildx ($DOCKER_BUILDX_VERSION)" DocumentInstalledItem "Docker-Buildx ($DOCKER_BUILDX_VERSION)"