Skip to content

Commit 7d5b854

Browse files
committed
fix ci machine for docker on macos
1 parent dce6678 commit 7d5b854

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

default.profraw

Whitespace-only changes.

hack/jenkins/osx_integration_tests_docker.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,13 @@ EXTRA_START_ARGS=""
3333
EXPECTED_DEFAULT_DRIVER="hyperkit"
3434

3535

36-
# restart docker on mac for a fresh test
37-
osascript -e 'quit app "Docker"'; open -a Docker ; while [ -z "$(docker info 2> /dev/null )" ]; do printf "."; sleep 1; done; echo "" || true
36+
# fix mac os as a service on mac os
37+
# https://github.com/docker/for-mac/issues/882#issuecomment-506372814
38+
osascript -e 'quit app "Docker"';
39+
sudo /Applications/Docker.app/Contents/MacOS/Docker --quit-after-install --unattended || true
40+
# repeating without sudo because https://github.com/docker/for-mac/issues/882#issuecomment-516946766
41+
/Applications/Docker.app/Contents/MacOS/Docker --quit-after-install --unattended || true
42+
osascript -e 'quit app "Docker"'; /Applications/Docker.app/Contents/MacOS/Docker --unattended &; while [ -z "$(docker info 2> /dev/null )" ]; do printf "."; sleep 1; done; echo "" || true
3843

3944
mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
4045
install cron/cleanup_and_reboot_Darwin.sh $HOME/cleanup_and_reboot.sh || echo "FAILED TO INSTALL CLEANUP"

0 commit comments

Comments
 (0)