From f608206926193a1345dad130867004c9bc6e0e2e Mon Sep 17 00:00:00 2001 From: sickcodes Date: Sun, 21 Feb 2021 11:02:41 +0000 Subject: [PATCH] Add NOPICKER=false in :latest. Add NOPICKER=true in :auto. Add networking speed docs. --- CHANGELOG.md | 1 + Dockerfile | 3 +++ Dockerfile.auto | 3 +++ README.md | 10 ++++++++++ 4 files changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b47a7f..49f258a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ |Version|Date|Notes| |---|---|---| +| |2021-02-21|Add NOPICKER environment variable to ALL images.| |3.1|2021-02-21|Remove testing repos. Switch to base-devel. We shouldn't be using testing repos in a Dockerfile for light increase in stability. Add the mandatory glibc patch to every pacman until someone upstream fixes it.| | |2021-02-07|Add NOPICKER environment variable to :naked image for effortless boot toggling.| | |2021-02-07|Add MAC_ADDRESS environment variable.| diff --git a/Dockerfile b/Dockerfile index 1007c73..8445ecb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -219,12 +219,15 @@ ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img ENV NETWORKING=e1000-82545em # ENV NETWORKING=vmxnet3 +ENV NOPICKER=false + VOLUME ["/tmp/.X11-unix"] CMD case "$(file --brief /image)" in \ QEMU*) export IMAGE_PATH=/image && sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" 2>/dev/null || true;; \ directory*) export IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img;; \ esac \ + ; [[ "${NOPICKER}" == true ]] && mv ./Launch-nopicker.sh ./Launch.sh \ ; ./enable-ssh.sh && envsubst < ./Launch.sh | bash # virt-manager mode: eta son diff --git a/Dockerfile.auto b/Dockerfile.auto index ef6a836..ab8e67d 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -131,12 +131,15 @@ ENV DISPLAY=:99 ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img +ENV NOPICKER=true + ENV TERMS_OF_USE=i_agree ENV BOILERPLATE="By using this Dockerfile, you hereby agree that you are a security reseacher or developer and agree to use this Dockerfile to make the world a safer place. Examples include: making your apps safer, finding your mobile phone, compiling security products, etc. You understand that Docker-OSX is an Open Source project, which is released to the public under the GNU Pulic License version 3 and above. You acknowledge that the Open Source project is absolutely unaffiliated with any third party, in any form whatsoever. Any trademarks or intelectual property which happen to be mentioned anywhere in or around the project are owned by their respective owners. By using this Dockerfile, you agree to agree to the EULA of each piece of upstream or downstream software. The following code is released for the sole purpose of security research, under the GNU Public License version 3. If you are concerned about the licensing, please note that this project is not AGPL. A copy of the license is available online: https://github.com/sickcodes/Docker-OSX/blob/master/LICENSE. In order to use the following Dockerfile you must read and understand the terms. Once you have read the terms, use the -e TERMS_OF_USE=i_agree or -e TERMS_OF_USE=i_disagree" CMD echo "${BOILERPLATE}" \ && [[ "${TERMS_OF_USE}" = i_agree ]] || exit 1 \ + ; [[ "${NOPICKER}" == true ]] && mv ./Launch-nopicker.sh ./Launch.sh \ ; [[ "${DISPLAY}" = ':99' ]] && { \ nohup Xvfb :99 -screen 0 1920x1080x16 \ & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 0.1 ; done \ diff --git a/README.md b/README.md index f272869..d8eb9d0 100644 --- a/README.md +++ b/README.md @@ -191,6 +191,14 @@ docker run -it \ ``` +# Internet Speeds + +### Slow internet but iMessage & iCloud compatability +`-e NETWORKING=e1000-82545em` + +### FAST internet but not compatable with iMessage & iCloud +`-e NETWORKING=vmxnet3` + ### Other cool Docker-QEMU based projects: [Run iOS in a Docker with Docker-eyeOS](https://github.com/sickcodes/Docker-eyeOS) - [https://github.com/sickcodes/Docker-eyeOS](https://github.com/sickcodes/Docker-eyeOS) @@ -518,6 +526,8 @@ docker start newcontainerid # DESTROY: Wipe old images to free disk space +The easiest way to clean out your entire Docker (ALL images, layers, and containers) is to `sudo rm -rf /var/lib/docker` + This is useful for getting disk space back. It will delete ALL your old (and new) docker containers.