kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

hack/make: don't attempt to unmount non-existing daemon root-dir 

Before:

    DONE 2 tests in 12.272s
    ---> Making bundle: .integration-daemon-stop (in bundles/test-integration)
    umount: bundles/test-integration/root: mountpoint not found

After:

    DONE 2 tests in 14.650s
    ---> Making bundle: .integration-daemon-stop (in bundles/test-integration)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-10-09 12:55:25 +02:00
parent d56adcf0ec
commit 9407a57522
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/make/.integration-daemon-stop
View File

@ -11,7 +11,9 @@ if [ ! "$(go env GOOS)" = 'windows' ]; then
echo >&2 "warning: PID $pid from $pidFile had a nonzero exit code" echo >&2 "warning: PID $pid from $pidFile had a nonzero exit code"
fi fi
root=$(dirname "$pidFile")/root root=$(dirname "$pidFile")/root
umount "$root" || true if [ -d "$root" ]; then
umount "$root" || true
fi
done done
if [ -z "$DOCKER_TEST_HOST" ]; then if [ -z "$DOCKER_TEST_HOST" ]; then