Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
| ... | ... |
@@ -13,12 +13,12 @@ bundle_test_integration_cli() {
|
| 13 | 13 |
# subshell so that we can export PATH without breaking other things |
| 14 | 14 |
( |
| 15 | 15 |
export PATH="$DEST/../binary:$DEST/../dynbinary:$PATH" |
| 16 |
- |
|
| 16 |
+ |
|
| 17 | 17 |
if ! command -v docker &> /dev/null; then |
| 18 | 18 |
echo >&2 'error: binary or dynbinary must be run before test-integration-cli' |
| 19 | 19 |
false |
| 20 | 20 |
fi |
| 21 |
- |
|
| 21 |
+ |
|
| 22 | 22 |
( set -x; exec \ |
| 23 | 23 |
docker --daemon --debug \ |
| 24 | 24 |
--storage-driver "$DOCKER_GRAPHDRIVER" \ |
| ... | ... |
@@ -26,10 +26,10 @@ bundle_test_integration_cli() {
|
| 26 | 26 |
--pidfile "$DEST/docker.pid" \ |
| 27 | 27 |
&> "$DEST/docker.log" |
| 28 | 28 |
) & |
| 29 |
- |
|
| 29 |
+ |
|
| 30 | 30 |
# pull the busybox image before running the tests |
| 31 | 31 |
sleep 2 |
| 32 |
- |
|
| 32 |
+ |
|
| 33 | 33 |
if ! docker inspect busybox &> /dev/null; then |
| 34 | 34 |
if [ -d /docker-busybox ]; then |
| 35 | 35 |
( set -x; docker build -t busybox /docker-busybox ) |
| ... | ... |
@@ -39,7 +39,7 @@ bundle_test_integration_cli() {
|
| 39 | 39 |
fi |
| 40 | 40 |
|
| 41 | 41 |
bundle_test_integration_cli |
| 42 |
- |
|
| 42 |
+ |
|
| 43 | 43 |
DOCKERD_PID=$(set -x; cat $DEST/docker.pid) |
| 44 | 44 |
( set -x; kill $DOCKERD_PID ) |
| 45 | 45 |
wait $DOCKERD_PID || true |