diff options
| author | sickcodes <[email protected]> | 2021-10-24 16:11:16 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-10-24 16:11:16 +0000 |
| commit | 50c5dce110981a0943bf8d24a28ed8d5cb339e8d (patch) | |
| tree | 1560a68db762dc44832309e3875f53cb34555f07 | |
| parent | Merge pull request #361 from Buthrakaur/improve-readme-windows (diff) | |
| download | docker-osx-50c5dce110981a0943bf8d24a28ed8d5cb339e8d.tar.xz docker-osx-50c5dce110981a0943bf8d24a28ed8d5cb339e8d.zip | |
squash naked images for hub.docker.com
| -rw-r--r-- | tests/test.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/test.sh b/tests/test.sh index 1f84a9e..e66f04f 100644 --- a/tests/test.sh +++ b/tests/test.sh @@ -215,6 +215,7 @@ docker-osx:latest () { docker-osx:naked () { docker build ${NO_CACHE} \ + --squash \ --build-arg RANKMIRRORS=true \ --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \ -f ./Dockerfile.naked \ @@ -225,6 +226,7 @@ docker-osx:naked () { docker-osx:naked-auto () { docker build ${NO_CACHE} \ + --squash \ --build-arg RANKMIRRORS=true \ --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \ -f ./Dockerfile.naked-auto \ @@ -272,6 +274,12 @@ docker-osx:auto-big-sur () { } reset_docker_hard () { + + tee /etc/docker/daemon.json <<'EOF' +{ + "experimental": true +} +EOF systemctl disable --now docker systemctl disable --now docker.socket systemctl stop docker @@ -298,7 +306,7 @@ export DEBIAN_FRONTEND=noninteractive \ ; echo start_xvfb \ ; start_vnc \ ; enable_kvm \ -; echo reset_docker_hard \ +; reset_docker_hard \ ; echo killall Xvfb \ ; clone_repo "${BRANCH}" "${REPO}" \ ; cd Docker-OSX \ |