614fad87b9
Without this patch, containers inherit the open file descriptors of the daemon, so my "exec 42>&2" allows us to "echo >&42 some nasty error with some bad advice" directly into the daemon log. :) Also, "hack/dind" was already doing this due to issues caused by the inheritance, so I'm removing that hack too since this patch obsoletes it by generalizing it for all containers. Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon) Upstream-commit: d5d62ff95574a48816890d8d6e0785a79f559c3c Component: engine
50 lines
1.2 KiB
Bash
50 lines
1.2 KiB
Bash
#!/bin/bash
|
|
set -e
|
|
|
|
DEST=$1
|
|
|
|
DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs}
|
|
DOCKER_EXECDRIVER=${DOCKER_EXECDRIVER:-native}
|
|
|
|
bundle_test_integration_cli() {
|
|
go_test_dir ./integration-cli
|
|
}
|
|
|
|
# subshell so that we can export PATH without breaking other things
|
|
(
|
|
export PATH="$DEST/../binary:$DEST/../dynbinary:$PATH"
|
|
|
|
if ! command -v docker &> /dev/null; then
|
|
echo >&2 'error: binary or dynbinary must be run before test-integration-cli'
|
|
false
|
|
fi
|
|
|
|
# intentionally open a couple bogus file descriptors to help test that they get scrubbed in containers
|
|
exec 41>&1 42>&2
|
|
|
|
( set -x; exec \
|
|
docker --daemon --debug \
|
|
--storage-driver "$DOCKER_GRAPHDRIVER" \
|
|
--exec-driver "$DOCKER_EXECDRIVER" \
|
|
--pidfile "$DEST/docker.pid" \
|
|
&> "$DEST/docker.log"
|
|
) &
|
|
|
|
# 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
|
|
|
|
bundle_test_integration_cli
|
|
|
|
DOCKERD_PID=$(set -x; cat $DEST/docker.pid)
|
|
( set -x; kill $DOCKERD_PID )
|
|
wait $DOCKERD_PID || true
|
|
) 2>&1 | tee $DEST/test.log
|