toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)

Browse Source 
Creating the "docker save" tarball for "scratch" is pretty simple.  I've also extrapolated the "docker build -t busybox ." logic into a separate "hack/make/.ensure-busybox" file so that it can eventually be reused easier.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c8381d672226dd17f2e17f9cf9378f06d533911c
Component: engine
This commit is contained in:
Tianon Gravi
2014-04-28 22:23:22 -06:00
parent bf6a9b5906
commit cc76f7eafc
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/hack/make/test-integration-cli
View File

@ -30,13 +30,7 @@ bundle_test_integration_cli() {
# pull the busybox image before running the tests
sleep 2
if ! docker inspect busybox &> /dev/null; then
if [ -d /docker-busybox ]; then
( set -x; docker build -t busybox /docker-busybox )
else
( set -x; docker pull busybox )
fi
fi
source "$(dirname "$BASH_SOURCE")/.ensure-busybox"
bundle_test_integration_cli