0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #40751 from cpuguy83/tmpfs_for_main_test_daemon

Browse source 
Put integration daemon socket in /run
This commit is contained in:
Bjorn Neergaard 2023-07-17 10:17:54 -06:00 • committed by GitHub
commit 37dcdac218
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
hack/make/.integration-daemon-start
View file

@ -102,8 +102,19 @@ if [ -z "$DOCKER_TEST_HOST" ]; then
)
fi
# "pwd" tricks to make sure $DEST is an absolute path, not a relative one
export DOCKER_HOST="unix://$(cd "$DEST" && pwd)/docker.sock"
if [ -n "${DOCKER_ROOTLESS}" ]; then
# "pwd" tricks to make sure $DEST is an absolute path, not a relative one
export DOCKER_HOST="unix://$(cd "$DEST" && pwd)/docker.sock"
else
# Put socket in /run because:
# 1. That's the normal place for such things
# 2. When running on Docker For Mac, if you need to run tests with the bundles dir mounted (e.g. to poke through test artifacts).
# the socket will not work because it will be over osxfs.
mkdir -p /run/docker
sock_dir=$(mktemp -d -p /run/docker)
chmod 0755 "$sock_dir"
export DOCKER_HOST="unix://${sock_dir}/docker.sock"
fi
(
echo "Starting dockerd"
[ -n "$TESTDEBUG" ] && set -x