diff options
| author | sickcodes <[email protected]> | 2021-03-04 09:52:45 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-03-04 09:52:45 +0000 |
| commit | 377c4e7cc5cdd785e965e13e15086c2326797b51 (patch) | |
| tree | 7e3c8bdf73e97686cae8b6ab32befb170e31cc0f | |
| parent | Add --custom-plist-url, --custom-plist <filename> or --master-plist to both s... (diff) | |
| download | docker-osx-377c4e7cc5cdd785e965e13e15086c2326797b51.tar.xz docker-osx-377c4e7cc5cdd785e965e13e15086c2326797b51.zip | |
Add -e MASTER_PLIST_URL to change the input config.plist at runtime.
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | Dockerfile.auto | 2 | ||||
| -rw-r--r-- | Dockerfile.naked | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8396d7d..abc2d75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ |Version|Date|Notes| |---|---|---| +| |2021-03-04|Add `-e MASTER_PLIST_URL` to all images to allow using your own remote plist.| | |2021-03-03|Add WIDTH and HEIGHT to set the x and y resolutions, use in conjuction with serial numbers.| | |2021-03-02|Add ADDITIONAL_PORTS, for example `-e ADDITIONAL_PORTS='hostfwd=tcp::23-:23,'`| |4.0|2021-02-27|Add big-sur support. Use `sickcodes/docker-osx:big-sur` or build using `--build-arg VERSION=11`| @@ -273,6 +273,8 @@ ENV NOPICKER=false ENV WIDTH=1920 ENV HEIGHT=1080 +ENV MASTER_PLIST_URL="https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/custom/config-nopicker-custom.plist" + VOLUME ["/tmp/.X11-unix"] # check if /image is a disk image or a directory. This allows you to optionally use -v disk.img:/image @@ -307,6 +309,7 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS ; } \ ; [[ "${GENERATE_UNIQUE}" == true ]] && { \ ./Docker-OSX/custom/generate-unique-machine-values.sh \ + --master-plist-url="${MASTER_PLIST_URL}" \ --count 1 \ --tsv ./serial.tsv \ --bootdisks \ @@ -318,6 +321,7 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \ source "${ENV:=/env}" \ || ./Docker-OSX/custom/generate-specific-bootdisk.sh \ + --master-plist-url="${MASTER_PLIST_URL}" \ --model "${DEVICE_MODEL}" \ --serial "${SERIAL}" \ --board-serial "${BOARD_SERIAL}" \ diff --git a/Dockerfile.auto b/Dockerfile.auto index a5b03a8..d203551 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -152,6 +152,7 @@ CMD echo "${BOILERPLATE}" \ ; } \ ; [[ "${GENERATE_UNIQUE}" == true ]] && { \ ./Docker-OSX/custom/generate-unique-machine-values.sh \ + --master-plist-url="${MASTER_PLIST_URL}" \ --count 1 \ --tsv ./serial.tsv \ --bootdisks \ @@ -163,6 +164,7 @@ CMD echo "${BOILERPLATE}" \ ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \ source "${ENV:=/env}" \ || ./Docker-OSX/custom/generate-specific-bootdisk.sh \ + --master-plist-url="${MASTER_PLIST_URL}" \ --model "${DEVICE_MODEL}" \ --serial "${SERIAL}" \ --board-serial "${BOARD_SERIAL}" \ diff --git a/Dockerfile.naked b/Dockerfile.naked index e2a2806..a1a1de3 100644 --- a/Dockerfile.naked +++ b/Dockerfile.naked @@ -122,6 +122,7 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS ; } \ ; [[ "${GENERATE_UNIQUE}" == true ]] && { \ ./Docker-OSX/custom/generate-unique-machine-values.sh \ + --master-plist-url="${MASTER_PLIST_URL}" \ --count 1 \ --tsv ./serial.tsv \ --bootdisks \ @@ -133,6 +134,7 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \ source "${ENV:=/env}" \ || ./Docker-OSX/custom/generate-specific-bootdisk.sh \ + --master-plist-url="${MASTER_PLIST_URL}" \ --model "${DEVICE_MODEL}" \ --serial "${SERIAL}" \ --board-serial "${BOARD_SERIAL}" \ |