CREDIT: @TheHackerCoding Typo in README.md #194

Alternative, calc at runtime?

Perhaps
```
-e RAM=auto \
```
```
RAM=${RAM:-$(("$(head -n1 /proc/meminfo | tr -dc '[:digit:]') / 900000"))}000 \
exec qemu-system-x86_64 -m ${RAM} \
```

.github/ISSUE_TEMPLATE/issue-running-docker-osx.md

@@ -0,0 +1,26 @@
+---
+name: Issue Running Docker-OSX
+about: OS related issued, please help us identify the issue by posting the output
+  of this
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+# OS related issued, please help us identify the issue by posting the output of this
+uname -a \
+; echo "${DISPLAY}" \
+; echo 1 | sudo tee /sys/module/kvm/parameters/ignore_msrs \
+; grep NAME /etc/os-release \
+; df -h . \
+; qemu-system-x86_64 --version \
+; libvirtd --version \
+; free -mh \
+; nproc \
+; egrep -c '(svm|vmx)' /proc/cpuinfo \
+; ls -lha /dev/kvm \
+; ls -lha /tmp/.X11-unix/ \
+; ps aux | grep dockerd \
+; docker ps | grep osx \
+; grep "docker\|kvm\|virt" /etc/group

.github/ISSUE_TEMPLATE/open-an-issue.md

@@ -0,0 +1,10 @@
+---
+name: Open an Issue
+about: About anything!
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "osx-serial-generator"]
+	path = osx-serial-generator
+	url = https://github.com/sickcodes/osx-serial-generator.git

CHANGELOG.md

@@ -1,5 +1,13 @@
 |Version|Date|Notes|
 |---|---|---|
+|4.2|2021-03-15|No longer use static qcow2 bootdisks. Create at runtime. Supply own with `-v plist:/plist` plus `-e MASTER_PLIST=/plist` or `-e MASTER_PLIST_URL=https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist`|
+|   |2021-03-14|Change default RAM to 2G|
+|   |2021-03-09|Add https://github.com/sickcodes/osx-serial-generator.git as a submodule to replace ./custom|
+|   |2021-03-06|Change envs to require --envs. Automatically enable --envs if --output-env is used. Same for plists, bootdisks. Fix help ugliness and sanity of generate serial scripts. Fix bootdisk not getting written to persistent file when using NOPICKER=true. NOPICKER=true is overridden by a custom plist now anyway. Remove useless case statements. Allow -e HEADLESS=true as human readable alternative to -e DISPLAY=:99.|
+|4.1|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`|
 |   |2021-02-26|Change `-e NOPICKER=true` to simply do `sed -i '/^.*InstallMedia.*/d' Launch.sh` and `export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2`.|
 |3.2|2021-02-25|Add a script to generate unique machine serial numbers. Add a script to generate a bootdisk from given serial numbers. Add Linux for libguestfs which allows the docker container to make QEMU bootdisks with specific serial numbers.|
 |   |2021-02-21|Add NOPICKER environment variable to ALL images.|

CREDITS.md

@@ -56,3 +56,6 @@ These credits refer to the contributors to this repository:
 
 [@MrBenFTW](https://github.com/MrBenFTW) - Tempfix for arch #150
 
+[@edsonboldrini](https://github.com/edsonboldrini) - Update README.md #161
+
+[@TheHackerCoding](https://github.com/TheHackerCoding) - Typo in README.md #194 

Dockerfile

@@ -5,11 +5,12 @@
 #  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |
 # /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_|
 #
-# Repo:             https://github.com/sickcodes/Docker-OSX/
-# Title:            Mac on Docker (Docker-OSX)
-# Author:           Sick.Codes https://sick.codes/
-# Version:          3.2
+# Title:            Docker-OSX (Mac on Docker)
+# Author:           Sick.Codes https://twitter.com/sickcodes
+# Version:          4.2
 # License:          GPLv3+
+# Repository:       https://github.com/sickcodes/Docker-OSX
+# Website:          https://sick.codes
 #
 # All credits for OSX-KVM and the rest at @Kholia's repo: https://github.com/kholia/osx-kvm
 # OpenCore support go to https://github.com/Leoyzen/KVM-Opencore
@@ -125,7 +126,7 @@ RUN tee -a sshd_config <<< 'AllowTcpForwarding yes' \
 USER arch
 
 # download OSX-KVM
-RUN git clone --depth 1 https://github.com/kholia/OSX-KVM.git /home/arch/OSX-KVM
+RUN git clone --recurse-submodules --depth 1 https://github.com/kholia/OSX-KVM.git /home/arch/OSX-KVM
 
 # enable ssh
 # docker exec .... ./enable-ssh.sh
@@ -150,7 +151,7 @@ RUN touch enable-ssh.sh \
 
 # RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils edk2-ovmf netctl libvirt-dbus --overwrite --noconfirm
 
-RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils openresolv jack ebtables edk2-ovmf netctl libvirt-dbus --overwrite --noconfirm \
+RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils openresolv jack ebtables edk2-ovmf netctl libvirt-dbus wget --overwrite --noconfirm \
     && yes | sudo pacman -Scc
 
 # TEMP-FIX for pacman issue
@@ -164,10 +165,23 @@ RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
 
 WORKDIR /home/arch/OSX-KVM
 
-RUN python fetch-macOS.py --version "${VERSION}" \
-    && qemu-img convert BaseSystem.dmg -O qcow2 -p -c BaseSystem.img \
-    && qemu-img create -f qcow2 mac_hdd_ng.img "${SIZE}" \
-    && rm -f BaseSystem.dmg
+RUN [[ "${VERSION%%.*}" -lt 11 ]] && { python fetch-macOS.py --version "${VERSION}" \
+        && qemu-img convert BaseSystem.dmg -O qcow2 -p -c BaseSystem.img \
+        && qemu-img create -f qcow2 mac_hdd_ng.img "${SIZE}" \
+        && rm -f BaseSystem.dmg \
+    ; } || true
+
+# VERSION=11.2.1
+# this downloads LATEST ONLY
+ARG FETCH_MAC_OS_RAW=https://raw.githubusercontent.com/acidanthera/OpenCorePkg/master/Utilities/macrecovery/macrecovery.py
+# submit a PR to here to get the version option https://github.com/acidanthera/OpenCorePkg/blob/master/Utilities/macrecovery/macrecovery.py
+
+RUN [[ "${VERSION%%.*}" -ge 11 ]] && { wget "${FETCH_MAC_OS_RAW}" \
+        && python macrecovery.py download \
+        && qemu-img convert BaseSystem.dmg -O qcow2 -p -c BaseSystem.img \
+        && qemu-img create -f qcow2 mac_hdd_ng.img "${SIZE}" \
+        && rm -f BaseSystem.dmg \
+    ; } || true
 
 # > Launch.sh
 # > Docker-OSX.xml
@@ -184,8 +198,14 @@ RUN if [[ "${LINUX}" == true ]]; then \
         && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." \
     ; fi
 
-# temporary branch, remove in final PR
-RUN git clone --branch custom-identity https://github.com/sickcodes/Docker-OSX.git
+# optional --build-arg to change branches for testing
+ARG BRANCH=master
+ARG REPO='https://github.com/sickcodes/Docker-OSX.git'
+RUN git clone --recurse-submodules --depth 1 --branch "${BRANCH}" "${REPO}"
+
+# env -e ADDITIONAL_PORTS with a comma
+# for example, -e ADDITIONAL_PORTS=hostfwd=tcp::23-:23,
+ENV ADDITIONAL_PORTS=
 
 RUN touch Launch.sh \
     && chmod +x ./Launch.sh \
@@ -193,7 +213,7 @@ RUN touch Launch.sh \
     && tee -a Launch.sh <<< 'set -eu' \
     && tee -a Launch.sh <<< 'sudo chown    $(id -u):$(id -g) /dev/kvm 2>/dev/null || true' \
     && tee -a Launch.sh <<< 'sudo chown -R $(id -u):$(id -g) /dev/snd 2>/dev/null || true' \
-    && tee -a Launch.sh <<< 'exec qemu-system-x86_64 -m ${RAM:-8}000 \' \
+    && tee -a Launch.sh <<< 'exec qemu-system-x86_64 -m ${RAM:-2}000 \' \
     && tee -a Launch.sh <<< '-cpu Penryn,vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+pcid,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check \' \
     && tee -a Launch.sh <<< '-machine q35,accel=kvm:tcg \' \
     && tee -a Launch.sh <<< '-smp ${CPU_STRING:-${SMP:-4},cores=${CORES:-4}} \' \
@@ -210,8 +230,8 @@ RUN touch Launch.sh \
     && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=qcow2 \' \
     && tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=${IMAGE_PATH:-/home/arch/OSX-KVM/mac_hdd_ng.img},format=qcow2 \' \
     && tee -a Launch.sh <<< '-device ide-hd,bus=sata.4,drive=MacHDD \' \
-    && tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900, \' \
-    && tee -a Launch.sh <<< '-device ${NETWORKING:-e1000-82545em},netdev=net0,id=net0,mac=${MAC_ADDRESS:-52:54:00:09:49:17} \' \
+    && tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900,${ADDITIONAL_PORTS} \' \
+    && tee -a Launch.sh <<< '-device ${NETWORKING:-vmxnet3},netdev=net0,id=net0,mac=${MAC_ADDRESS:-52:54:00:09:49:17} \' \
     && tee -a Launch.sh <<< '-monitor stdio \' \
     && tee -a Launch.sh <<< '-vga vmware \' \
     && tee -a Launch.sh <<< '${EXTRA:-}'
@@ -227,7 +247,7 @@ USER arch
 
 ENV USER arch
 
-ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2
+ENV BOOTDISK=
 
 ENV DISPLAY=:0.0
 
@@ -235,13 +255,25 @@ ENV ENV=/env
 
 ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
 
-ENV NETWORKING=e1000-82545em
-# ENV NETWORKING=vmxnet3
+# ENV NETWORKING=e1000-82545em
+ENV NETWORKING=vmxnet3
 
+# Boolean for generating a bootdisk with new random serials.
+ENV GENERATE_UNIQUE=false
+
+# Boolean for generating a bootdisk with specific serials.
+ENV GENERATE_SPECIFIC=false
+
+# boolean for skipping the disk selection menu at in the boot process
 ENV NOPICKER=false
 
-ENV UNIQUE=false
-# Boolean for generating a bootdisk with new serials.
+# The x and y coordinates for resolution.
+# Must be used with either -e GENERATE_UNIQUE=true or -e GENERATE_SPECIFIC=true.
+ENV WIDTH=1920
+ENV HEIGHT=1080
+
+ENV MASTER_PLIST_URL=
+ENV MASTER_PLIST=./Docker-OSX/osx-serial-generator/config-custom.plist
 
 VOLUME ["/tmp/.X11-unix"]
 
@@ -257,48 +289,52 @@ VOLUME ["/tmp/.X11-unix"]
     # -e UUID="5CCB366D-9118-4C61-A00A-E5BAF3BED451" \
     # -e MAC_ADDRESS="A8:5C:2C:9A:46:2F" \
 
+### DEPRECATED:
 # the output will be /bootdisk.
 # /bootdisk is a useful persistent place to store the 15Mb serial number bootdisk.
+### WHY? Pointless as bootdisk will be made at runtime.
 
 # if you don't set any of the above:
 # the default serial numbers are already contained in ./OpenCore-Catalina/OpenCore.qcow2
 # And the default serial numbers
 
-CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
-    ; case "$(file --brief /image)" in \
-        QEMU\ QCOW2\ Image* ) export IMAGE_PATH=/image \
-            ;; \
-        directory* ) export IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img \
-            ;; \
-    esac \
+# First, the container touches files. This will cause the host to give the file to that container
+# Second, the container chowns all those files, so that it can use them
+# If NOPICKER is true, the config-nopicker-custom.plist is used
+## If you set a URL instead, it will download that over whatever you set for the MASTER_PLIST
+
+CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
+    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
     ; [[ "${NOPICKER}" == true ]] && { \
         sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2 \
+        && export MASTER_PLIST="${MASTER_PLIST:-./Docker-OSX/osx-serial-generator/config-nopicker-custom.plist}" \
     ; } \
+    || export MASTER_PLIST="${MASTER_PLIST:-./Docker-OSX/osx-serial-generator/config-custom.plist}" \
+    ; [[ "${MASTER_PLIST_URL}" ]] && wget -O "${MASTER_PLIST}" "${MASTER_PLIST_URL}" \
     ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
-        ./Docker-OSX/custom/generate-unique-machine-values.sh \
-        --count 1 \
-        --tsv ./serial.tsv \
-        --bootdisks \
-        --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-        --output-env "${ENV:=/env}" || exit 1 \
+        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
+            --master-plist="${MASTER_PLIST}" \
+            --count 1 \
+            --tsv ./serial.tsv \
+            --bootdisks \
+            --width "${WIDTH:-1920}" \
+            --height "${HEIGHT:-1080}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+            --output-env "${ENV:=/env}" \
     ; } \
     ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
-            source "${ENV:=/env}" \
-            || ./Docker-OSX/custom/generate-specific-bootdisk.sh \
+            source "${ENV:=/env}" 2>/dev/null \
+            ; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
+            --master-plist="${MASTER_PLIST}" \
             --model "${DEVICE_MODEL}" \
             --serial "${SERIAL}" \
             --board-serial "${BOARD_SERIAL}" \
             --uuid "${UUID}" \
             --mac-address "${MAC_ADDRESS}" \
-            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" || exit 1 \
+            --width "${WIDTH:-1920}" \
+            --height "${HEIGHT:-1080}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
     ; } \
-    ; case "$(file --brief /bootdisk)" in \
-        QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \
-            ;; \
-        directory* ) export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2 \
-            ;; \
-    esac \
     ; ./enable-ssh.sh && envsubst < ./Launch.sh | bash
 
 # virt-manager mode: eta son

Dockerfile.auto

@@ -3,13 +3,14 @@
 #    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
 #   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   / 
 #  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |  
-# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_|  AUTOINSTALL
+# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_|  :AUTO
 # 
-# Title:            Mac on Docker (Docker-OSX) [AUTOINSTALL]
-# Author:           Sick.Codes https://twitter.com/sickcodes       
-# Version:          3.2
+# Title:            Docker-OSX (Mac on Docker)
+# Author:           Sick.Codes https://twitter.com/sickcodes
+# Version:          4.2
 # License:          GPLv3+
 # Repository:       https://github.com/sickcodes/Docker-OSX
+# Website:          https://sick.codes
 # 
 # This Dockerfile is a pre-installed naked installation of Docker-OSX!
 # 
@@ -78,7 +79,7 @@ RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
 RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
     && if [[ "${SCROT}" ]]; then \
         pacman -Syu scrot base-devel --noconfirm \
-        && git clone https://github.com/stolk/imcat.git \
+        && git clone --recurse-submodules --depth 1 https://github.com/stolk/imcat.git \
         && cd imcat \
         && make \
         && sudo cp imcat /usr/bin/imcat \
@@ -119,67 +120,78 @@ ARG IMAGE_URL='https://images2.sick.codes/mac_hdd_ng_auto.img'
 
 # use the COMPLETE arg, for a complete image, ready to boot.
 # otherwise use your own image: -v "$PWD/disk.img":/image
+ARG WGET_OPTIONS=
+# ARG WGET_OPTIONS='--no-verbose'
+
 RUN if [[ "${COMPLETE}" ]]; then \
         echo "Downloading 20GB+ image... This step might take a while... Press Ctrl+C if you want to abort." \
         ; rm -f /home/arch/OSX-KVM/mac_hdd_ng.img \
-        && wget --no-verbose -O /home/arch/OSX-KVM/mac_hdd_ng.img "${IMAGE_URL}" \
+        && wget ${WGET_OPTIONS} -O /home/arch/OSX-KVM/mac_hdd_ng.img "${IMAGE_URL}" \
     ; fi
 
-ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2
+ENV BOOTDISK=
 
 ENV DISPLAY=:99
 
+ENV HEADLESS=false
+
 ENV ENV=/env
 
 ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
 
 ENV NOPICKER=true
 
+# The x and y coordinates for resolution.
+# Must be used with either -e GENERATE_UNIQUE=true or -e GENERATE_SPECIFIC=true.
+ENV WIDTH=1920
+ENV HEIGHT=1080
+
+ENV MASTER_PLIST_URL=
+ENV MASTER_PLIST=./Docker-OSX/osx-serial-generator/config-nopicker-custom.plist
+
 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"
+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."
 
 CMD echo "${BOILERPLATE}" \
     ; [[ "${TERMS_OF_USE}" = i_agree ]] || exit 1 \
     ; echo "Disk is being copied between layers... Please wait a minute..." \
-    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
+    ; sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
+    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
     ; [[ "${NOPICKER}" == true ]] && { \
         sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2 \
+        && export MASTER_PLIST="${MASTER_PLIST:-./Docker-OSX/osx-serial-generator/config-nopicker-custom.plist}" \
     ; } \
+    || export MASTER_PLIST="${MASTER_PLIST:-./Docker-OSX/osx-serial-generator/config-custom.plist}" \
+    ; [[ "${MASTER_PLIST_URL}" ]] && wget -O "${MASTER_PLIST}" "${MASTER_PLIST_URL}" \
     ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
-        ./Docker-OSX/custom/generate-unique-machine-values.sh \
-        --count 1 \
-        --tsv ./serial.tsv \
-        --bootdisks \
-        --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-        --output-env "${ENV:=/env}" || exit 1 \
+        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
+            --master-plist="${MASTER_PLIST}" \
+            --count 1 \
+            --tsv ./serial.tsv \
+            --bootdisks \
+            --width "${WIDTH:-1920}" \
+            --height "${HEIGHT:-1080}" \
+            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+            --output-env "${ENV:=/env}" \
     ; } \
     ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
-            source "${ENV:=/env}" \
-            || ./Docker-OSX/custom/generate-specific-bootdisk.sh \
+            source "${ENV:=/env}" 2>/dev/null \
+            ; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
+            --master-plist="${MASTER_PLIST}" \
             --model "${DEVICE_MODEL}" \
             --serial "${SERIAL}" \
             --board-serial "${BOARD_SERIAL}" \
             --uuid "${UUID}" \
             --mac-address "${MAC_ADDRESS}" \
-            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" || exit 1 \
+            --width "${WIDTH:-1920}" \
+            --height "${HEIGHT:-1080}" \
+            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}"  \
     ; } \
-    ; case "$(file --brief /bootdisk)" in \
-        QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \
-            ;; \
-        directory* ) export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2 \
-            ;; \
-    esac \
-    ; [[ "${DISPLAY}" = ':99' ]] && { \
+    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
         nohup Xvfb :99 -screen 0 1920x1080x16 \
-        & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 0.1 ; done \
+        & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
     ; } \
-    ; echo "Checking whether /image is a directory or a QEMU disk." \
-    ; case "$(file --brief /image)" in \
-        QEMU*) export IMAGE_PATH=/image;; \
-        directory*) export IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img;; \
-    esac \
     ; stat "${IMAGE_PATH}" \
     ; echo "Large image is being copied between layers, please wait a minute..." \
     ; ./enable-ssh.sh \

Dockerfile.naked

@@ -3,13 +3,14 @@
 #    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
 #   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   / 
 #  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |  
-# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_|  NAKED/SUPPLY_YOUR_OWN
+# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_|  :NAKED
 # 
-# Title:            Mac on Docker (Docker-OSX) [AUTOINSTALL]
-# Author:           Sick.Codes https://twitter.com/sickcodes       
-# Version:          3.2
+# Title:            Docker-OSX (Mac on Docker)
+# Author:           Sick.Codes https://twitter.com/sickcodes
+# Version:          4.2
 # License:          GPLv3+
 # Repository:       https://github.com/sickcodes/Docker-OSX
+# Website:          https://sick.codes
 # 
 # This image won't run unless you supply a disk image using:
 #       -v ${PWD}/mac_hdd_ng.img:/image
@@ -67,7 +68,7 @@ ARG SCROT
 RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
     && if [[ "${SCROT}" ]]; then \
         pacman -Syu scrot base-devel --noconfirm \
-        && git clone https://github.com/stolk/imcat.git \
+        && git clone --recurse-submodules --depth 1 https://github.com/stolk/imcat.git \
         && cd imcat \
         && make \
         && sudo cp imcat /usr/bin/imcat \
@@ -101,47 +102,60 @@ RUN mkdir -p ~/.ssh \
     && tee -a ~/.ssh/config <<< '    StrictHostKeyChecking no' \
     && tee -a ~/.ssh/config <<< '    UserKnownHostsFile=/dev/null'
 
-ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2
+ENV BOOTDISK=
 
 ENV DISPLAY=:99
 
+ENV HEADLESS=false
+
 ENV ENV=/env
 
 ENV IMAGE_PATH=/image
 
 ENV NOPICKER=true
 
-CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
-    ; [[ "${DISPLAY}" = ':99' ]] && { \
+# The x and y coordinates for resolution.
+# Must be used with either -e GENERATE_UNIQUE=true or -e GENERATE_SPECIFIC=true.
+ENV WIDTH=1920
+ENV HEIGHT=1080
+
+ENV MASTER_PLIST_URL=
+ENV MASTER_PLIST=./Docker-OSX/osx-serial-generator/config-nopicker-custom.plist
+
+CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
+    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
+    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
         nohup Xvfb :99 -screen 0 1920x1080x16 \
         & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
     ; } \
     ; [[ "${NOPICKER}" == true ]] && { \
         sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2 \
+        && export MASTER_PLIST="${MASTER_PLIST:-./Docker-OSX/osx-serial-generator/config-nopicker-custom.plist}" \
     ; } \
+    || export MASTER_PLIST="${MASTER_PLIST:-./Docker-OSX/osx-serial-generator/config-custom.plist}" \
+    ; [[ "${MASTER_PLIST_URL}" ]] && wget -O "${MASTER_PLIST}" "${MASTER_PLIST_URL}" \
     ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
-        ./Docker-OSX/custom/generate-unique-machine-values.sh \
-        --count 1 \
-        --tsv ./serial.tsv \
-        --bootdisks \
-        --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-        --output-env "${ENV:=/env}" || exit 1 \
+        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
+            --master-plist="${MASTER_PLIST}" \
+            --count 1 \
+            --tsv ./serial.tsv \
+            --bootdisks \
+            --width "${WIDTH:-1920}" \
+            --height "${HEIGHT:-1080}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+            --output-env "${ENV:=/env}" \
     ; } \
     ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
-            source "${ENV:=/env}" \
-            || ./Docker-OSX/custom/generate-specific-bootdisk.sh \
+            source "${ENV:=/env}" 2>/dev/null \
+            ; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
+            --master-plist="${MASTER_PLIST}" \
             --model "${DEVICE_MODEL}" \
             --serial "${SERIAL}" \
             --board-serial "${BOARD_SERIAL}" \
             --uuid "${UUID}" \
             --mac-address "${MAC_ADDRESS}" \
-            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" || exit 1 \
+            --width "${WIDTH:-1920}" \
+            --height "${HEIGHT:-1080}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
     ; } \
-    ; case "$(file --brief /bootdisk)" in \
-        QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \
-            ;; \
-        directory* ) export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2 \
-            ;; \
-    esac \
     ; ./enable-ssh.sh && envsubst < ./Launch.sh | bash

README.md

@@ -15,7 +15,9 @@ https://github.com/sickcodes/Docker-OSX/blob/master/CREDITS.md
 
 Docker Hub: https://hub.docker.com/r/sickcodes/docker-osx
 
-- sickcodes/docker-osx:latest - base recovery image
+- sickcodes/docker-osx:latest - base recovery image (10)
+
+- sickcodes/docker-osx:big-sur - base recovery image (11)
 
 - sickcodes/docker-osx:naked - supply your own .img file
 
@@ -41,13 +43,39 @@ Thank you to @cephasara for this major contribution.
 
 #### Follow [@sickcodes on Twitter](https://twitter.com/sickcodes) for updates or feature requests!
 
+# Basic Quick Start Docker-OSX
+
+```bash
+
+docker pull sickcodes/docker-osx:latest
+
+# Catalina
+docker run -it \
+    --device /dev/kvm \
+    -p 50922:10022 \
+    -v /tmp/.X11-unix:/tmp/.X11-unix \
+    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    sickcodes/docker-osx:latest
+
+# Big Sur
+docker run -it \
+    --device /dev/kvm \
+    -p 50922:10022 \
+    -v /tmp/.X11-unix:/tmp/.X11-unix \
+    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    sickcodes/docker-osx:big-sur
+
+# Wait 2-3 minutes until you see the logo.
+
+```
+
 # How to use
 
 ### There are 3 images: **latest**, **auto** and **naked**.
 
-`sickcodes/docker-osx:latest` - [I want to try it out.](https://github.com/sickcodes/Docker-OSX#quick-start-175gb-pre-made-image)
+`sickcodes/docker-osx:latest` - [I want to try it out.](https://github.com/sickcodes/Docker-OSX#quick-start-large-pre-made-image)
 
-`sickcodes/docker-osx:latest` - [I want to use Docker-OSX to develop/secure Apps in Xcode (sign into Xcode, Transporter)](https://github.com/sickcodes/Docker-OSX#quick-start-docker-osx)
+`sickcodes/docker-osx:latest` - [I want to use Docker-OSX to develop/secure Apps in Xcode (sign into Xcode, Transporter)](https://github.com/sickcodes/Docker-OSX#basic-quick-start-docker-osx)
 
 `sickcodes/docker-osx:naked` - [I want to use Docker-OSX in CI/CD (sign into Xcode, Transporter)](https://github.com/sickcodes/Docker-OSX#fully-headless-using-my-own-image-for-cicd)
 Create your personal image using `:latest`. And then pull your image out. And then use duplicate that image again & again for use in `:naked`.
@@ -57,17 +85,17 @@ Create your personal image using `:latest`. And then pull your image out. And th
 `sickcodes/docker-osx:naked` - [I need iMessage/iCloud for security research.](https://github.com/sickcodes/Docker-OSX#serial-numbers)
 
 #### I need a screen.
-**KEEP** these two lines are in your command. Works in ANY of the machines:
+**KEEP** these two lines are in your command. Works in `auto` & `naked` machines:
 ```dockerfile
     -v /tmp/.X11-unix:/tmp/.X11-unix \
     -e "DISPLAY=${DISPLAY:-:0.0}" \
 ```
 
 #### I need headless.
-**REMOVE** these two lines from ANY of the machines:
+**REMOVE** these two lines from `auto` or `naked` machines:
 ```dockerfile
-    -v /tmp/.X11-unix:/tmp/.X11-unix \
-    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    # -v /tmp/.X11-unix:/tmp/.X11-unix \
+    # -e "DISPLAY=${DISPLAY:-:0.0}" \
 ```
 
 #### I have used it already, and want to copy this image.
@@ -78,23 +106,6 @@ Use `docker commit`, copy the ID, and then `docker start ID`
 [Pull out the .img file](https://github.com/sickcodes/Docker-OSX#backup-the-disk-wheres-my-disk), and then use that [.img file with :naked](https://github.com/sickcodes/Docker-OSX#quick-start-own-image-naked-container-image)
 
 
-# Basic Quick Start Docker-OSX
-
-```bash
-
-docker pull sickcodes/docker-osx:latest
-
-docker run -it \
-    --device /dev/kvm \
-    -p 50922:10022 \
-    -v /tmp/.X11-unix:/tmp/.X11-unix \
-    -e "DISPLAY=${DISPLAY:-:0.0}" \
-    sickcodes/docker-osx:latest
-
-# Wait 2-3 minutes until you see the logo.
-
-```
-
 # Quick Start Large Pre-Made Image
 
 Current large image size: 17.5GB
@@ -212,7 +223,8 @@ docker run -it \
     sickcodes/docker-osx:naked
 ```
 
-# Features In Docker-OSX v3.2
+# Features In Docker-OSX v4
+- `sickcodes/docker-osx:big-sur` - original base recovery image for latest OS (safe)
 - Serial number generators. [See below or ./custom](https://github.com/sickcodes/Docker-OSX/tree/master/custom)
 - Full auto mode: boot straight to OSX shell and even run commands as runtime arguments!
 - `sickcodes/docker-osx:latest` - original base recovery image (safe)
@@ -481,6 +493,43 @@ sudo nohup dockerd &
 sudo systemctl enable docker
 ```
 
+# How to Forward Additional Ports from the guest.
+
+This is how it visually looks:
+
+`host:10023 <-> 10023:container:10023 <-> 80:guest`
+
+```bash
+On the host
+```bash
+docker run -it \
+    --device /dev/kvm \
+    -p 50922:10022 \
+    -e ADDITIONAL_PORTS='hostfwd=tcp::10023-:80,' \
+    -p 10023:10023 \
+    sickcodes/docker-osx:auto
+```
+
+Inside the container:
+```bash
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
+brew install nginx
+sudo sed -i -e 's/8080/80/' /usr/local/etc/nginx/nginx.confcd
+# sudo nginx -s stop
+sudo nginx
+```
+
+nginx should appear on the host at port 10023.
+
+You can string multiple statements, for example:
+
+```bash
+    -e ADDITIONAL_PORTS='hostfwd=tcp::10023-:80,hostfwd=tcp::10043-:443,'
+    -p 10023:10023 \
+    -p 10043:10043 \
+```
+
 # How to Enable Network Forwarding
 
 Allow ipv4 forwarding for bridged networking connections:
@@ -565,12 +614,11 @@ sudo mv somedir/mac_hdd_ng.img .
 
 # Internet Speeds
 
-### Slow internet but iMessage & iCloud compatability
-`-e NETWORKING=e1000-82545em`
-
-### FAST internet but not compatable with iMessage & iCloud
+### FAST internet
 `-e NETWORKING=vmxnet3`
 
+### SLOW internet
+`-e NETWORKING=e1000-82545em`
 
 # DESTROY: Wipe old images to free disk space
 
@@ -695,11 +743,13 @@ For serial numbers, generate them in `./custom` OR make docker generate them at
 At any time, verify your serial number before logging in iCloud, etc.
 
 ```bash
+# this is a quick way to check your serial number via cli inside OSX
 ioreg -l | grep IOPlatformSerialNumber
 
 # or from the host
-sshpass -p alpine ssh user@localhost -p 50922 'ioreg -l | grep IOPlatformSerialNumber'
+sshpass -p 'alpine' ssh user@localhost -p 50922 'ioreg -l | grep IOPlatformSerialNumber'
 ```
+# This example generates a random set of serial numbers at runtime, headlessly
 
 ```bash
 # proof of concept only, generates random serial numbers, headlessly, and quits right after.
@@ -713,10 +763,11 @@ docker run --rm -it \
     sickcodes/docker-osx:auto
 ```
 
+# This example generates a specific set of serial numbers at runtime
+
 ```bash
 # run the same as above 17gb auto image, with SSH, with nopicker, and save the bootdisk for later.
 # you don't need to save the bootdisk IF you supply specific serial numbers!
-touch ./C02TW0WAHX87.qcow
 
 docker run -it \
     --device /dev/kvm \
@@ -732,14 +783,15 @@ docker run -it \
     sickcodes/docker-osx:auto
 ```
 
+### This example generates a specific set of serial numbers at runtime, with your existing image, at 1000x1000 display resolution.
 
 ```bash
-# run an existing image in current directory, with a screen, with SSH, with nopicker, and save the bootdisk for later.
+# run an existing image in current directory, with a screen, with SSH, with nopicker.
 
 stat mac_hdd_ng.img # make sure you have an image if you're using :naked
-touch ./mynewbootdisk.qcow
 
 docker run -it \
+    -v "${PWD}/mac_hdd_ng.img:/image" \
     --device /dev/kvm \
     -e "DISPLAY=${DISPLAY:-:0.0}" \
     -v /tmp/.X11-unix:/tmp/.X11-unix \
@@ -751,9 +803,8 @@ docker run -it \
     -e BOARD_SERIAL="C027251024NJG36UE" \
     -e UUID="5CCB366D-9118-4C61-A00A-E5BAF3BED451" \
     -e MAC_ADDRESS="A8:5C:2C:9A:46:2F" \
-    -e BOOTDISK=/bootdisk \
-    -v "${PWD}/mynewbootdisk.qcow:/bootdisk" \
-    -v "${PWD}/mac_hdd_ng.img:/image" \
+    -e WIDTH=1000 \
+    -e HEIGHT=1000 \
     sickcodes/docker-osx:naked
 ```
 
@@ -774,10 +825,9 @@ Or you can generate them inside the `./custom` folder. And then use:
 ```bash
 
 stat mac_hdd_ng_testing.img
-touch ./output.qcow 
 touch ./output.env
 
-# generate fresh random serial numbers, with a screen, using my own image, and save the bootdisk AND env file with my new serial numbers for later.
+# generate fresh random serial numbers, with a screen, using your own image, and save env file with your new serial numbers for later.
 
 docker run -it \
     --device /dev/kvm \
@@ -788,8 +838,6 @@ docker run -it \
     -e GENERATE_UNIQUE=true \
     -e GENERATE_SPECIFIC=true \
     -e DEVICE_MODEL="iMacPro1,1" \
-    -e BOOTDISK=/bootdisk \
-    -v "${PWD}/output.qcow:/bootdisk" \
     -v "${PWD}/output.env:/env" \
     -v "${PWD}/mac_hdd_ng_testing.img:/image" \
     sickcodes/docker-osx:naked
@@ -809,7 +857,7 @@ _`ROM` is just the lowercased mac address, without `:` between each word._
 
 You can tell the container to generate them for you using `-e GENERATE_UNIQUE=true`
 
-Or tell the container to use specific ones using `-e GENERATE_UNIQUE=true`
+Or tell the container to use specific ones using `-e GENERATE_SPECIFIC=true`
 
 ```bash
     -e GENERATE_SPECIFIC=true \
@@ -865,6 +913,130 @@ generate-specific-bootdisk.sh \
     --output-bootdisk OpenCore-nopicker.qcow2
 ```
 
+# Change Resolution Docker-OSX - change resolution OpenCore OSX-KVM 
+
+The display resolution is controlled by this line:
+
+https://github.com/sickcodes/Docker-OSX/blob/master/custom/config-nopicker-custom.plist#L819
+
+Instead of mounting that disk, Docker-OSX will generate a new `OpenCore.qcow2` by using this one cool trick:
+
+```bash
+-e GENERATE_UNIQUE=true \
+-e WIDTH=800 \
+-e HEIGHT=600 \
+```
+
+To use `WIDTH`/`HEIGHT`, you must use with either `-e GENERATE_UNIQUE=true` or `-e GENERATE_SPECIFIC=true`.
+
+It will take around 30 seconds longer to boot because it needs to make a new boot partition using `libguestfs`.
+
+```bash
+-e GENERATE_SPECIFIC=true \
+-e WIDTH=1920 \
+-e HEIGHT=1080 \
+-e SERIAL="" \
+-e BOARD_SERIAL="" \
+-e UUID="" \
+-e MAC_ADDRESS="" \
+```
+
+## Change Docker-OSX Resolution Examples
+
+```bash
+# using an image in your current directory
+stat mac_hdd_ng.img
+
+docker run -it \
+    --device /dev/kvm \
+    -p 50922:10022 \
+    -v "${PWD}/mac_hdd_ng.img:/image" \
+    -v /tmp/.X11-unix:/tmp/.X11-unix \
+    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    -e GENERATE_SPECIFIC=true \
+    -e DEVICE_MODEL="iMacPro1,1" \
+    -e SERIAL="C02TW0WAHX87" \
+    -e BOARD_SERIAL="C027251024NJG36UE" \
+    -e UUID="5CCB366D-9118-4C61-A00A-E5BAF3BED451" \
+    -e MAC_ADDRESS="A8:5C:2C:9A:46:2F" \
+    -e MASTER_PLIST_URL=https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/custom/config-nopicker-custom.plist \
+    -e WIDTH=1600 \
+    -e HEIGHT=900 \
+    sickcodes/docker-osx:naked
+```
+
+```bash
+# generating random serial numbers, using the DIY installer, along with the screen resolution changes.
+docker run -it \
+    --device /dev/kvm \
+    -p 50922:10022 \
+    -v /tmp/.X11-unix:/tmp/.X11-unix \
+    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    -e GENERATE_UNIQUE=true \
+    -e WIDTH=800 \
+    -e HEIGHT=600 \
+    sickcodes/docker-osx:latest
+
+
+```
+
+
+Here's a few other resolutions! If you resolution is invalid, it will default to 800x600.
+
+```
+    -e WIDTH=800 \
+    -e HEIGHT=600 \
+```
+```
+    -e WIDTH=1280 \
+    -e HEIGHT=768 \
+```
+```
+    -e WIDTH=1600 \
+    -e HEIGHT=900 \
+```
+```
+    -e WIDTH=1920 \
+    -e HEIGHT=1080 \
+```
+```
+    -e WIDTH=2560 \
+    -e HEIGHT=1600 \
+```
+
+# Mount a disk inside OSX from the host
+
+Pass the disk into the container as a volume and then pass the disk again into QEMU command line extras with.
+
+Use the `config-custom.plist` because you probably want to see the boot menu, otherwise omit the first line:
+
+```bash
+DISK_TWO="${PWD}/mount_me.img"
+```
+```dockerfile
+-e MASTER_PLIST_URL='https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist' \
+-v "${DISK_TWO}:/disktwo" \
+-e EXTRA='-device ide-hd,bus=sata.5,drive=DISK-TWO -drive id=DISK-TWO,if=none,file=/disktwo,format=qcow2' \
+```
+
+Example:
+
+```bash
+OSX_IMAGE="${PWD}/mac_hdd_ng_xcode_bigsur.img"
+DISK_TWO="${PWD}/mount_me.img"
+
+docker run -it \
+    --device /dev/kvm \
+    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    -v /tmp/.X11-unix:/tmp/.X11-unix \
+    -e MASTER_PLIST_URL='https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist' \
+    -v "${OSX_IMAGE}":/image \
+    -v "${DISK_TWO}":/disktwo \
+    -e EXTRA='-device ide-hd,bus=sata.5,drive=DISK-TWO -drive id=DISK-TWO,if=none,file=/disktwo,format=qcow2' \
+    sickcodes/docker-osx:naked
+```
+
+
 # Allow USB passthrough
 
 The simplest way to do this is the following:

custom/README.md

@@ -0,0 +1,7 @@
+# OSX Serial Generator
+
+This folder has been moved to its own repository :)
+
+This is a temporary copy for hardlinks.
+
+See [https://github.com/sickcodes/osx-serial-generator](https://github.com/sickcodes/osx-serial-generator)

custom/config-nopicker-custom.plist

@@ -1,4 +1,5 @@
-<!-- This file is modified from https://github.com/kholia/OSX-KVM/tree/master/OpenCore-Catalina -->
+<!-- This file is modified by @sickcodes from https://github.com/kholia/OSX-KVM/tree/master/OpenCore-Catalina -->
+<!-- The modifications are placeholders for: {{DEVICE_MODEL}}, {{SERIAL}}, {{BOARD_SERIAL}}, {{UUID}}, {{ROM}}, {{WIDTH}}, {{HEIGHT}} -->
 <!-- All credit for this file https://github.com/kholia/OSX-KVM/blob/master/CREDITS.md -->
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -704,9 +705,7 @@
 			<key>MLB</key>
 			<string>{{BOARD_SERIAL}}</string>
 			<key>ROM</key>
-			<data>
-			{{ROM}}
-			</data>
+			<data>{{ROM}}</data>
 			<key>SpoofVendor</key>
 			<true/>
 			<key>SystemProductName</key>
@@ -816,7 +815,7 @@
 			<key>ReplaceTabWithSpace</key>
 			<false/>
 			<key>Resolution</key>
-			<string>1920x1080@32</string>
+			<string>{{WIDTH}}x{{HEIGHT}}@32</string>
 			<key>SanitiseClearScreen</key>
 			<false/>
 			<key>TextRenderer</key>

custom/generate-specific-bootdisk.sh

@@ -1,43 +1,58 @@
 #!/bin/bash
-#     ____             __             ____  ______  __
-#    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
-#   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   /
-#  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |
-# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_| GEN BOOT DISK
+#   ___  _____  __  ___          _      _    ___                       _           
+#  / _ \/ __\ \/ / / __| ___ _ _(_)__ _| |  / __|___ _ _  ___ _ _ __ _| |_ ___ _ _ 
+# | (_) \__ \>  <  \__ \/ -_) '_| / _` | | | (_ / -_) ' \/ -_) '_/ _` |  _/ _ \ '_|
+#  \___/|___/_/\_\ |___/\___|_| |_\__,_|_|  \___\___|_||_\___|_| \__,_|\__\___/_|  
 #
-# Repo:             https://github.com/sickcodes/Docker-OSX/
-# Title:            Mac on Docker (Docker-OSX)
+# Repo:             https://github.com/sickcodes/osx-serial-generator/
+# Title:            OSX Serial Generator
 # Author:           Sick.Codes https://sick.codes/
 # Version:          3.1
 # License:          GPLv3+
 
-help_text="Usage: generate-specific-bootdisk.sh
+set -e
 
-General options:
+help_text="Usage: ./generate-specific-bootdisk.sh 
+
+Required options:
     --model <string>                Device model, e.g. 'iMacPro1,1'
-    --serial <filename>             Device Serial number.
-    --board-serial <filename>       Board Serial number.
-    --uuid <filename>               SmUUID.
-    --mac-address <string>          Used to set the ROM value; lowercased and without a colon.
-    --output-bootdisk <filename>    Optionally change the bootdisk output filename.
+    --serial <string>               Device Serial number
+    --board-serial <string>         Main Logic Board Serial number (MLB)
+    --uuid <string>                 SMBIOS UUID (SmUUID)
+    --mac-address <string>          Used for both the MAC address and to set ROM
+                                    ROM is lowercased sans any colons
+Optional options:
+    --width <integer>               Resolution x axis length in px, default 1920
+    --height <integer>              Resolution y axis length in px, default 1080
+    --input-plist-url <url>         Specify an alternative master plist, via URL
+    --master-plist-url <url>        Same as above.
     --custom-plist <filename>       Optionally change the input plist.
-
+    --master-plist <filename>       Same as above.
+    --output-bootdisk <filename>    Optionally change the bootdisk filename
+    --output-plist <filename>       Optionally change the output plist filename
     --help, -h, help                Display this help and exit
 
+Placeholders:   {{DEVICE_MODEL}}, {{SERIAL}}, {{BOARD_SERIAL}}, {{UUID}},
+                {{ROM}}, {{WIDTH}}, {{HEIGHT}}
+
 Example:
-    ./generate-specific-bootdisk.sh \
-        --model iMacPro1,1 \
-        --serial C02TW0WAHX87 \
-        --board-serial C027251024NJG36UE \
-        --uuid 5CCB366D-9118-4C61-A00A-E5BAF3BED451 \
-        --mac-address A8:5C:2C:9A:46:2F \
-        --output-bootdisk OpenCore-nopicker.qcow2
+    ./generate-specific-bootdisk.sh \\
+        --model iMacPro1,1 \\
+        --serial C02TW0WAHX87 \\
+        --board-serial C027251024NJG36UE \\
+        --uuid 5CCB366D-9118-4C61-A00A-E5BAF3BED451 \\
+        --mac-address A8:5C:2C:9A:46:2F \\
+        --output-bootdisk ./OpenCore-nopicker.qcow2 \\
+        --width 1920 \\
+        --height 1080
 
 Author:  Sick.Codes https://sick.codes/
-Project: https://github.com/sickcodes/Docker-OSX/
+Project: https://github.com/sickcodes/osx-serial-generator/
+License: GPLv3+
 "
 
-PLIST_MASTER=config-nopicker-custom.plist
+OPENCORE_IMAGE_MAKER_URL='https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/opencore-image-ng.sh'
+MASTER_PLIST_URL='https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist'
 
 # gather arguments
 while (( "$#" )); do
@@ -51,6 +66,7 @@ while (( "$#" )); do
                 export DEVICE_MODEL="${1#*=}"
                 shift
             ;;
+
     --model* | -m* ) 
                 export DEVICE_MODEL="${2}"
                 shift
@@ -61,6 +77,7 @@ while (( "$#" )); do
                 export SERIAL="${1#*=}"
                 shift
             ;;
+
     --serial* )
                 export SERIAL="${2}"
                 shift
@@ -71,6 +88,7 @@ while (( "$#" )); do
                 export BOARD_SERIAL="${1#*=}"
                 shift
             ;;
+
     --board-serial* )
                 export BOARD_SERIAL="${2}"
                 shift
@@ -81,6 +99,7 @@ while (( "$#" )); do
                 export UUID="${1#*=}"
                 shift
             ;;
+
     --uuid* )
                 export UUID="${2}"
                 shift
@@ -91,34 +110,81 @@ while (( "$#" )); do
                 export MAC_ADDRESS="${1#*=}"
                 shift
             ;;
+
     --mac-address* )
                 export MAC_ADDRESS="${2}"
                 shift
                 shift
             ;;
 
+    --width=* )
+                export WIDTH="${1#*=}"
+                shift
+            ;;
+
+    --width* )
+                export WIDTH="${2}"
+                shift
+                shift
+            ;;
+
+    --height=* )
+                export HEIGHT="${1#*=}"
+                shift
+            ;;
+
+    --height* )
+                export HEIGHT="${2}"
+                shift
+                shift
+            ;;
+
     --output-bootdisk=* )
                 export OUTPUT_QCOW="${1#*=}"
                 shift
             ;;
+
     --output-bootdisk* )
                 export OUTPUT_QCOW="${2}"
                 shift
                 shift
             ;;
 
-    --custom-plist=* )
-                export INPUT_PLIST="${1#*=}"
+    --output-plist=* )
+                export OUTPUT_PLIST="${1#*=}"
                 shift
             ;;
-    --custom-plist* )
-                export INPUT_PLIST="${2}"
+
+    --output-plist* )
+                export OUTPUT_PLIST="${2}"
+                shift
+                shift
+            ;;
+
+    --master-plist-url=* | --input-plist-url=* | --custom-plist-url=* )
+                export MASTER_PLIST_URL="${1#*=}"
+                shift
+            ;;
+
+    --master-plist-url* | --input-plist-url* | --custom-plist-url* )
+                export MASTER_PLIST_URL="${2}"
+                shift
+                shift
+            ;;
+
+    --master-plist=* | --input-plist=* | --custom-plist=* )
+                export MASTER_PLIST="${1#*=}"
+                shift
+            ;;
+
+    --master-plist* | --input-plist* | --custom-plist* )
+                export MASTER_PLIST="${2}"
                 shift
                 shift
             ;;
 
     *)
-                echo "Invalid option. Running with default values..."
+                echo "Invalid option ${1}. Running with default values..."
                 shift
             ;;
     esac
@@ -126,36 +192,69 @@ done
 
 
 download_qcow_efi_folder () {
-    git clone --depth 1 https://github.com/kholia/OSX-KVM.git
-    cp -ra ./OSX-KVM/OpenCore-Catalina/EFI .
-    mkdir -p ./EFI/OC/Resources
-    # clone some Apple drivers
-    git clone --depth 1 https://github.com/acidanthera/OcBinaryData.git
-    # copy said drivers into EFI/OC/Resources
-    cp -a ./OcBinaryData/Resources/* ./EFI/OC/Resources
+
+    export EFI_FOLDER=./OpenCore-Catalina/EFI
+    export RESOURCES_FOLDER=./resources/OcBinaryData/Resources
+
+    # check if we are inside OSX-KVM already
+    # if not, download OSX-KVM locally
+    [ -d ./OpenCore-Catalina/EFI/ ] || {
+        [ -d ./OSX-KVM/ ] || git clone --recurse-submodules --depth 1 https://github.com/kholia/OSX-KVM.git
+        export EFI_FOLDER="./OSX-KVM/${EFI_FOLDER}"
+    }
+    
+    [ -d ./resources/OcBinaryData/Resources/ ] || {
+        export RESOURCES_FOLDER="./OSX-KVM/${RESOURCES_FOLDER}"
+    }
+
     # EFI Shell commands
     touch startup.nsh && echo 'fs0:\EFI\BOOT\BOOTx64.efi' > startup.nsh
+
+    cp -ra "${EFI_FOLDER}" .
+
+    mkdir -p ./EFI/OC/Resources
+
+    # copy Apple drivers into EFI/OC/Resources
+    cp -a "${RESOURCES_FOLDER}"/* ./EFI/OC/Resources
 }
 
 generate_bootdisk () {
-    [[ -e ./config-nopicker-custom.plist ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/custom-identity/custom/config-nopicker-custom.plist
-    [[ -e ./opencore-image-ng.sh ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/custom-identity/custom/opencore-image-ng.sh && chmod +x opencore-image-ng.sh
+
+    # need a config.plist
+    if [ "${MASTER_PLIST}" ]; then
+        [ -e "${MASTER_PLIST}" ] || echo "Could not find: ${MASTER_PLIST}"
+    elif [ "${MASTER_PLIST}" ] && [ "${MASTER_PLIST_URL}" ]; then
+        echo 'You specified both a custom plist FILE & custom plist URL.'
+        echo 'Use only one of those options.'
+    elif [ "${MASTER_PLIST_URL}" ]; then
+        wget -O "${MASTER_PLIST:=./config-custom.plist}" "${MASTER_PLIST_URL}"
+    else
+        # default is config-nopicker-custom.plist from OSX-KVM with placeholders used in Docker-OSX
+        wget -O "${MASTER_PLIST:=./config-nopicker-custom.plist}" "${MASTER_PLIST_URL}"
+    fi
+
+    [ -e ./opencore-image-ng.sh ] \
+        || { wget "${OPENCORE_IMAGE_MAKER_URL}" \
+            && chmod +x opencore-image-ng.sh ; }
+
     # plist required for bootdisks, so create anyway.
-    if [[ "${DEVICE_MODEL}" ]] \
-            && [[ "${SERIAL}" ]] \
-            && [[ "${BOARD_SERIAL}" ]] \
-            && [[ "${UUID}" ]] \
-            && [[ "${MAC_ADDRESS}" ]]; then
+    if [ "${DEVICE_MODEL}" ] \
+            && [ "${SERIAL}" ] \
+            && [ "${BOARD_SERIAL}" ] \
+            && [ "${UUID}" ] \
+            && [ "${MAC_ADDRESS}" ]; then
         ROM="${MAC_ADDRESS//\:/}"
         ROM="${ROM,,}"
-        sed -e s/{{DEVICE_MODEL}}/"${DEVICE_MODEL}"/g \
-            -e s/{{SERIAL}}/"${SERIAL}"/g \
-            -e s/{{BOARD_SERIAL}}/"${BOARD_SERIAL}"/g \
-            -e s/{{UUID}}/"${UUID}"/g \
-            -e s/{{ROM}}/"${ROM}"/g \
-            "${PLIST_MASTER}" > ./tmp.config.plist || exit 1
+        sed -e s/\{\{DEVICE_MODEL\}\}/"${DEVICE_MODEL}"/g \
+            -e s/\{\{SERIAL\}\}/"${SERIAL}"/g \
+            -e s/\{\{BOARD_SERIAL\}\}/"${BOARD_SERIAL}"/g \
+            -e s/\{\{UUID\}\}/"${UUID}"/g \
+            -e s/\{\{ROM\}\}/"${ROM}"/g \
+            -e s/\{\{WIDTH\}\}/"${WIDTH:-1920}"/g \
+            -e s/\{\{HEIGHT\}\}/"${HEIGHT:-1080}"/g \
+            "${MASTER_PLIST}" > ./tmp.config.plist || exit 1
     else
-        cat <<EOF
+        cat <<EOF && exit 1
 Error: one of the following values is missing:
 
 --model "${DEVICE_MODEL:-MISSING}"
@@ -164,12 +263,14 @@ Error: one of the following values is missing:
 --uuid "${UUID:-MISSING}"
 --mac-address "${MAC_ADDRESS:-MISSING}"
 
+--width "${WIDTH:-1920}"
+--height "${HEIGHT:-1080}"
+
 EOF
-        exit 1
     fi
 
     ./opencore-image-ng.sh \
-        --cfg "${INPUT_PLIST:-./tmp.config.plist}" \
+        --cfg "./tmp.config.plist" \
         --img "${OUTPUT_QCOW:-./${SERIAL}.OpenCore-nopicker.qcow2}" || exit 1
         rm ./tmp.config.plist
 

custom/generate-unique-machine-values.sh

@@ -1,58 +1,63 @@
 #!/bin/bash
-#     ____             __             ____  ______  __
-#    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
-#   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   /
-#  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |
-# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_| SERIALIZER
+#   ___  _____  __  ___          _      _    ___                       _           
+#  / _ \/ __\ \/ / / __| ___ _ _(_)__ _| |  / __|___ _ _  ___ _ _ __ _| |_ ___ _ _ 
+# | (_) \__ \>  <  \__ \/ -_) '_| / _` | | | (_ / -_) ' \/ -_) '_/ _` |  _/ _ \ '_|
+#  \___/|___/_/\_\ |___/\___|_| |_\__,_|_|  \___\___|_||_\___|_| \__,_|\__\___/_|  
 #
-# Repo:             https://github.com/sickcodes/Docker-OSX/
-# Title:            Mac on Docker (Docker-OSX)
+# Repo:             https://github.com/sickcodes/osx-serial-generator/
+# Title:            OSX Serial Generator
 # Author:           Sick.Codes https://sick.codes/
 # Version:          3.1
 # License:          GPLv3+
 
-help_text="Usage: generate-unique-machine-values.sh
+set -e
+
+help_text="Usage: ./generate-unique-machine-values.sh
 
 General options:
     --count, -n, -c <count>         Number of serials to generate
     --model, -m <model>             Device model, e.g. 'iMacPro1,1'
-    --csv <filename>                Optionally change the CSV output filename.
-    --tsv <filename>                Optionally change the TSV output filename.
-    --output-bootdisk <filename>    Optionally change the bootdisk qcow output filename. Useless when count > 1.
-    --output-env <filename>         Optionally change the bootdisk env filename. Useless when count > 1.
-    --output-dir <directory>        Optionally change the script output location.
-
+    --csv <filename>                Optionally change the CSV output filename
+    --tsv <filename>                Optionally change the TSV output filename
+    --output-dir <directory>        Optionally change the script output location
+    --width <string>                Resolution x axis length in px, default 1920
+    --height <string>               Resolution y axis length in px, default 1080
+    --input-plist-url <url>         Specify an alternative master plist, via URL
+    --master-plist-url <url>        Same as above.
+    --custom-plist <filename>       Optionally change the input plist.
+    --master-plist <filename>       Same as above.
+    --output-bootdisk <filename>    Optionally change the bootdisk filename
+    --create-envs, --envs           Create all corresponding sourcable envs
+    --create-plists, --plists       Create all corresponding config.plists
+    --create-bootdisks, --bootdisks Create all corresponding bootdisks [SLOW]
     --help, -h, help                Display this help and exit
-    --plists                        Create corresponding config.plists for each serial set.
-    --bootdisks                     [SLOW] Create corresponding boot disk images for each serial set.
+
+Additional options only if you are creating ONE serial set:
+    --output-bootdisk <filename>    Optionally change the bootdisk filename
+    --output-env <filename>         Optionally change the serials env filename
+
+Custom plist placeholders:
+    {{DEVICE_MODEL}}, {{SERIAL}}, {{BOARD_SERIAL}},
+    {{UUID}}, {{ROM}}, {{WIDTH}}, {{HEIGHT}}
 
 Example:
-    ./generate-unique-machine-values.sh --count 1 --model='iMacPro1,1' --plists --bootdisks
+    ./generate-unique-machine-values.sh --count 1 --plists --bootdisks --envs
 
-        The above example will generate a
-            - serial
-            - board serial
-            - uuid
-            - MAC address
-            - ROM value based on lowercase MAC address
-            - Boot disk qcow image.
-            - config.plist
-
-Notes:
-    - Default is 1 serial for 'iMacPro1,1' in the current working directory.
-    - Default output is CSV, whereas setting the TSV option will output as tab-separated.
-    - CSV is double quoted.
-    - If you do not set a CSV filename, the output will be sent to the output-dir.
-    - If you do not set an output-dir, the current directory will be the output directory.
-    - Sourcable environment variable shell files will be written to a folder, 'envs'.
-    - config.plist files will be written to a folder, 'plists'.
+Defaults:
+    - One serial, for 'iMacPro1,1', in the current working directory
+    - CSV and TSV output
+    - plists in ./plists/ & bootdisks in ./bootdisks/ & envs in ./envs
+    - if you set --bootdisk name, --bootdisks is assumed
+    - if you set --custom-plist, --plists is assumed
+    - if you set --output-env, --envs is assumed
 
 Author:  Sick.Codes https://sick.codes/
-Project: https://github.com/sickcodes/Docker-OSX/
+Project: https://github.com/sickcodes/osx-serial-generator/
+License: GPLv3+
 "
 
-MACINFOPKG_VERSION=2.1.2
-PLIST_MASTER=config-nopicker-custom.plist
+OPENCORE_IMAGE_MAKER_URL='https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/opencore-image-ng.sh'
+MASTER_PLIST_URL='https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist'
 
 # gather arguments
 while (( "$#" )); do
@@ -66,6 +71,7 @@ while (( "$#" )); do
                 export SERIAL_SET_COUNT="${1#*=}"
                 shift
             ;;
+
     --count* | -c* | -n* )
                 export SERIAL_SET_COUNT="${2}"
                 shift
@@ -76,6 +82,7 @@ while (( "$#" )); do
                 export CSV_OUTPUT_FILENAME="${1#*=}"
                 shift
             ;;
+
     --csv* )
                 export CSV_OUTPUT_FILENAME="${2}"
                 shift
@@ -86,6 +93,7 @@ while (( "$#" )); do
                 export TSV_OUTPUT_FILENAME="${1#*=}"
                 shift
             ;;
+
     --tsv* )
                 export TSV_OUTPUT_FILENAME="${2}"
                 shift
@@ -96,6 +104,7 @@ while (( "$#" )); do
                 export OUTPUT_DIRECTORY="${1#*=}"
                 shift
             ;;
+
     --output-dir* )
                 export OUTPUT_DIRECTORY="${2}"
                 shift
@@ -103,11 +112,12 @@ while (( "$#" )); do
             ;;
 
     --output-bootdisk=* )
-                export OUTPUT_QCOW="${1#*=}"
+                export OUTPUT_BOOTDISK="${1#*=}"
                 shift
             ;;
+
     --output-bootdisk* )
-                export OUTPUT_QCOW="${2}"
+                export OUTPUT_BOOTDISK="${2}"
                 shift
                 shift
             ;;
@@ -116,6 +126,7 @@ while (( "$#" )); do
                 export OUTPUT_ENV="${1#*=}"
                 shift
             ;;
+
     --output-env* )
                 export OUTPUT_ENV="${2}"
                 shift
@@ -126,18 +137,69 @@ while (( "$#" )); do
                 export DEVICE_MODEL="${1#*=}"
                 shift
             ;;
+
     --model* | -m* ) 
                 export DEVICE_MODEL="${2}"
                 shift
                 shift
             ;;
 
-    --plists )
+    --width=* )
+                export WIDTH="${1#*=}"
+                shift
+            ;;
+
+    --width* )
+                export WIDTH="${2}"
+                shift
+                shift
+            ;;
+
+    --height=* )
+                export HEIGHT="${1#*=}"
+                shift
+            ;;
+
+    --height* )
+                export HEIGHT="${2}"
+                shift
+                shift
+            ;;
+
+    --master-plist-url=* | --input-plist-url=* | --custom-plist-url=* )
+                export MASTER_PLIST_URL="${1#*=}"
+                shift
+            ;;
+
+    --master-plist-url* | --input-plist-url* | --custom-plist-url* )
+                export MASTER_PLIST_URL="${2}"
+                shift
+                shift
+            ;;
+
+    --master-plist=* | --input-plist=* | --custom-plist=* )
+                export MASTER_PLIST="${1#*=}"
+                shift
+            ;;
+
+    --master-plist* | --input-plist* | --custom-plist* )
+                export MASTER_PLIST="${2}"
+                shift
+                shift
+            ;;
+
+    --create-plists | --plists )
                 export CREATE_PLISTS=1
                 shift
             ;;
-    --bootdisks ) 
-                export CREATE_QCOWS=1
+
+    --create-bootdisks | --bootdisks )
+                export CREATE_BOOTDISKS=1
+                shift
+            ;;
+
+    --create-envs | --envs )
+                export CREATE_ENVS=1
                 shift
             ;;
 
@@ -150,58 +212,65 @@ done
 
 
 build_mac_serial () {
-    export MACINFOPKG_VERSION="${MACINFOPKG_VERSION:=2.1.2}"
-    wget -O "${TARBALL:=./MacInfoPkg.tar.gz}" \
-        "https://github.com/acidanthera/MacInfoPkg/archive/${MACINFOPKG_VERSION}.tar.gz"
-    tar -xzvf "${TARBALL}"
-    cd "./MacInfoPkg-${MACINFOPKG_VERSION}/macserial" \
-        && ./build.tool \
-        && cd -
-    mv "./MacInfoPkg-${MACINFOPKG_VERSION}/macserial/bin/macserial" .
-    rm -f "${TARBALL}"
-    rm -rf "./MacInfoPkg-${MACINFOPKG_VERSION}/"
+    [ -d ./OpenCorePkg ] ||  git clone --depth 1 https://github.com/acidanthera/OpenCorePkg.git
+    make -C ./OpenCorePkg/Utilities/macserial/
+    mv ./OpenCorePkg/Utilities/macserial/macserial .
     chmod +x ./macserial
     stat ./macserial
 }
 
 download_vendor_mac_addresses () {
     # download the MAC Address vendor list
-    [[ -e "${MAC_ADDRESSES_FILE:=vendor_macs.tsv}" ]] || wget -O "${MAC_ADDRESSES_FILE}" https://gitlab.com/wireshark/wireshark/-/raw/master/manuf
+    [ -e "${MAC_ADDRESSES_FILE:=vendor_macs.tsv}" ] || wget -O "${MAC_ADDRESSES_FILE}" https://gitlab.com/wireshark/wireshark/-/raw/master/manuf
 }
 
 download_qcow_efi_folder () {
-    git clone --depth 1 https://github.com/kholia/OSX-KVM.git
-    cp -ra ./OSX-KVM/OpenCore-Catalina/EFI .
-    mkdir -p ./EFI/OC/Resources
-    # clone some Apple drivers
-    git clone --depth 1 https://github.com/acidanthera/OcBinaryData.git
-    # copy said drivers into EFI/OC/Resources
-    cp -a ./OcBinaryData/Resources/* ./EFI/OC/Resources
+
+    export EFI_FOLDER=./OpenCore-Catalina/EFI
+    export RESOURCES_FOLDER=./resources/OcBinaryData/Resources
+
+    # check if we are inside OSX-KVM already
+    # if not, download OSX-KVM locally
+    [ -d ./OpenCore-Catalina/EFI/ ] || {
+        [ -d ./OSX-KVM/ ] || git clone --recurse-submodules --depth 1 https://github.com/kholia/OSX-KVM.git
+        export EFI_FOLDER="./OSX-KVM/${EFI_FOLDER}"
+    }
+    
+    [ -d ./resources/OcBinaryData/Resources/ ] || {
+        export RESOURCES_FOLDER="./OSX-KVM/${RESOURCES_FOLDER}"
+    }
+
     # EFI Shell commands
     touch startup.nsh && echo 'fs0:\EFI\BOOT\BOOTx64.efi' > startup.nsh
+
+    cp -ra "${EFI_FOLDER}" .
+
+    mkdir -p ./EFI/OC/Resources
+
+    # copy Apple drivers into EFI/OC/Resources
+    cp -a "${RESOURCES_FOLDER}"/* ./EFI/OC/Resources
 }
 
 
 generate_serial_sets () {
-    [[ -e ./config-nopicker-custom.plist ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/custom-identity/custom/config-nopicker-custom.plist
-    [[ -e ./opencore-image-ng.sh ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/custom-identity/custom/opencore-image-ng.sh && chmod +x opencore-image-ng.sh
-    mkdir -p "${OUTPUT_DIRECTORY}/envs"
-    export DATE_NOW="$(date +%F-%T)"
-    export DEVICE_MODEL="${DEVICE_MODEL:=iMacPro1,1}"
-    export VENDOR_REGEX="${VENDOR_REGEX:=Apple, Inc.}"
-    
-    if [[ "${CSV_OUTPUT_FILENAME}" ]] || [[ "${TSV_OUTPUT_FILENAME}" ]]; then
-        [[ ${CSV_OUTPUT_FILENAME} ]] && export CSV_SERIAL_SETS_FILE="${CSV_OUTPUT_FILENAME}"
-        [[ ${TSV_OUTPUT_FILENAME} ]] && export TSV_SERIAL_SETS_FILE="${TSV_OUTPUT_FILENAME}"
-    else
-        export SERIAL_SETS_FILE="${OUTPUT_DIRECTORY}/serial_sets-${DATE_NOW}.csv"
-    fi
-    
-    touch "${SERIAL_SETS_FILE}"
-    echo "Writing serial sets to ${SERIAL_SETS_FILE}"
 
+
+    
+    if [ "${CSV_OUTPUT_FILENAME}" ]; then
+        [ "${CSV_OUTPUT_FILENAME}" ] && export CSV_SERIAL_SETS_FILE="${CSV_OUTPUT_FILENAME}"
+    else
+        export CSV_SERIAL_SETS_FILE="${OUTPUT_DIRECTORY}/serial_sets-${DATE_NOW}.csv"
+    fi
+
+    if [ "${TSV_OUTPUT_FILENAME}" ]; then
+        [ "${TSV_OUTPUT_FILENAME}" ] && export TSV_SERIAL_SETS_FILE="${TSV_OUTPUT_FILENAME}"
+    else
+        export TSV_SERIAL_SETS_FILE="${OUTPUT_DIRECTORY}/serial_sets-${DATE_NOW}.tsv"
+    fi
+
+    
     ./macserial \
-        --num "${SERIAL_SET_COUNT:=1}" \
+        --num "${SERIAL_SET_COUNT}" \
         --model "${DEVICE_MODEL}" \
         | while IFS='\ \|\ ' read -r SERIAL BOARD_SERIAL; do
             # make a uuid...
@@ -213,61 +282,96 @@ generate_serial_sets () {
             RANDOM_MAC_PREFIX="$(cut -d$'\t' -f1 <<< "${RANDOM_MAC_PREFIX}")"
             MAC_ADDRESS="$(printf "${RANDOM_MAC_PREFIX}:%02X:%02X:%02X" $[RANDOM%256] $[RANDOM%256] $[RANDOM%256])"
 
+            [ -z "${WIDTH}" ] && WIDTH=1920
+            [ -z "${HEIGHT}" ] && HEIGHT=1080
+
             # append to csv file
-            if [[ "${CSV_SERIAL_SETS_FILE}" ]]; then
-                echo "\"${DEVICE_MODEL}\",\"${SERIAL}\",\"${BOARD_SERIAL}\",\"${UUID}\",\"${MAC_ADDRESS}\"" >> "${CSV_SERIAL_SETS_FILE}"
-            fi
+            cat <<EOF >> "${CSV_SERIAL_SETS_FILE}"
+"${DEVICE_MODEL}","${SERIAL}","${BOARD_SERIAL}","${UUID}","${MAC_ADDRESS}","${WIDTH}","${HEIGHT}"
+EOF
+            echo "Wrote CSV to: ${CSV_SERIAL_SETS_FILE}"
 
             # append to tsv file
-            if [[ "${TSV_SERIAL_SETS_FILE}" ]]; then
-                printf "${DEVICE_MODEL}\t${SERIAL}\t${BOARD_SERIAL}\t${UUID}\t${MAC_ADDRESS}\n" >> "${TSV_SERIAL_SETS_FILE}"
-            fi 
+            T=$'\t'
+            cat <<EOF >> "${TSV_SERIAL_SETS_FILE}"
+${DEVICE_MODEL}${T}${SERIAL}${T}${BOARD_SERIAL}${T}${UUID}${T}${MAC_ADDRESS}${T}${WIDTH}${T}${HEIGHT}
+EOF
+            echo "Wrote CSV to: ${TSV_SERIAL_SETS_FILE}"
 
-            OUTPUT_ENV_FILE="${OUTPUT_ENV:-"${OUTPUT_DIRECTORY}/envs/${SERIAL}.env.sh"}"
-            touch "${OUTPUT_ENV_FILE}"
-            cat <<EOF > "${OUTPUT_ENV_FILE}"
+            # if any of these are on, we need the env file.
+            if [ "${CREATE_ENVS}" ] || [ "${CREATE_PLISTS}" ] || [ "${CREATE_BOOTDISKS}" ] || [ "${OUTPUT_BOOTDISK}" ] || [ "${OUTPUT_ENV}" ]; then
+                mkdir -p "${OUTPUT_DIRECTORY}/envs"
+                OUTPUT_ENV_FILE="${OUTPUT_ENV:-"${OUTPUT_DIRECTORY}/envs/${SERIAL}.env.sh"}"
+                touch "${OUTPUT_ENV_FILE}"
+                cat <<EOF > "${OUTPUT_ENV_FILE}"
 export DEVICE_MODEL="${DEVICE_MODEL}"
 export SERIAL="${SERIAL}"
 export BOARD_SERIAL="${BOARD_SERIAL}"
 export UUID="${UUID}"
 export MAC_ADDRESS="${MAC_ADDRESS}"
+export WIDTH="${WIDTH}"
+export HEIGHT="${HEIGHT}"
 EOF
 
+            fi
+
             # plist required for bootdisks, so create anyway.
-            if [[ "${CREATE_PLISTS}" ]] || [[ "${CREATE_QCOWS}" ]]; then
+            if [ "${CREATE_PLISTS}" ] || [ "${CREATE_BOOTDISKS}" ]; then
+
+                # need a config.plist
+                if [ "${MASTER_PLIST}" ]; then
+                    [ -e "${MASTER_PLIST}" ] || echo "Could not find: ${MASTER_PLIST}"
+                elif [ "${MASTER_PLIST}" ] && [ "${MASTER_PLIST_URL}" ]; then
+                    echo 'You specified both a custom plist FILE & custom plist URL.'
+                    echo 'Use only one of those options.'
+                elif [ "${MASTER_PLIST_URL}" ]; then
+                    wget -O "${MASTER_PLIST:=./config-custom.plist}" "${MASTER_PLIST_URL}"
+                else
+                    # default is config-nopicker-custom.plist from OSX-KVM with placeholders used in Docker-OSX
+                    wget -O "${MASTER_PLIST:=./config-nopicker-custom.plist}" "${MASTER_PLIST_URL}"
+                fi
+
                 mkdir -p "${OUTPUT_DIRECTORY}/plists"
                 source "${OUTPUT_ENV_FILE}"
                 ROM_VALUE="${MAC_ADDRESS//\:/}"
                 ROM_VALUE="${ROM_VALUE,,}"
-                sed -e s/{{DEVICE_MODEL}}/"${DEVICE_MODEL}"/g \
-                    -e s/{{SERIAL}}/"${SERIAL}"/g \
-                    -e s/{{BOARD_SERIAL}}/"${BOARD_SERIAL}"/g \
-                    -e s/{{UUID}}/"${UUID}"/g \
-                    -e s/{{ROM}}/"${ROM}"/g \
-                    "${PLIST_MASTER}" > "${OUTPUT_DIRECTORY}/plists/${SERIAL}.config.plist" || exit 1
+                sed -e s/\{\{DEVICE_MODEL\}\}/"${DEVICE_MODEL}"/g \
+                    -e s/\{\{SERIAL\}\}/"${SERIAL}"/g \
+                    -e s/\{\{BOARD_SERIAL\}\}/"${BOARD_SERIAL}"/g \
+                    -e s/\{\{UUID\}\}/"${UUID}"/g \
+                    -e s/\{\{ROM\}\}/"${ROM}"/g \
+                    -e s/\{\{WIDTH\}\}/"${WIDTH}"/g \
+                    -e s/\{\{HEIGHT\}\}/"${HEIGHT}"/g \
+                    "${MASTER_PLIST}" > "${OUTPUT_DIRECTORY}/plists/${SERIAL}.config.plist" || exit 1
             fi
 
-            if [[ "${CREATE_QCOWS}" ]]; then
-                mkdir -p "${OUTPUT_DIRECTORY}/qcows"
+            # make bootdisk qcow2 format if --bootdisks, but also if you set the bootdisk filename
+            if [ "${CREATE_BOOTDISKS}" ] || [ "${OUTPUT_BOOTDISK}" ]; then
+                [ -e ./opencore-image-ng.sh ] \
+                    || { wget "${OPENCORE_IMAGE_MAKER_URL}" \
+                        && chmod +x opencore-image-ng.sh ; }
+                mkdir -p "${OUTPUT_DIRECTORY}/bootdisks"
                 ./opencore-image-ng.sh \
                     --cfg "${OUTPUT_DIRECTORY}/plists/${SERIAL}.config.plist" \
-                    --img "${OUTPUT_QCOW:-${OUTPUT_DIRECTORY}/qcows/${SERIAL}.OpenCore-nopicker.qcow2}" || exit 1
+                    --img "${OUTPUT_BOOTDISK:-${OUTPUT_DIRECTORY}/bootdisks/${SERIAL}.OpenCore-nopicker.qcow2}" || exit 1
             fi
 
         done
 
-        [[ -e "${CSV_SERIAL_SETS_FILE}" ]] && \
-            cat <(echo "DEVICE_MODEL,SERIAL,BOARD_SERIAL,UUID,MAC_ADDRESS") "${CSV_SERIAL_SETS_FILE}"
+        [ -e "${CSV_SERIAL_SETS_FILE}" ] && \
+            cat <(echo "DEVICE_MODEL,SERIAL,BOARD_SERIAL,UUID,MAC_ADDRESS,WIDTH,HEIGHT") "${CSV_SERIAL_SETS_FILE}"
 
 
-        [[ -e "${TSV_SERIAL_SETS_FILE}" ]] && \
-            cat <(printf "DEVICE_MODEL\tSERIAL\tBOARD_SERIAL\tUUID\tMAC_ADDRESS\n") "${TSV_SERIAL_SETS_FILE}"
-    
+        [ -e "${TSV_SERIAL_SETS_FILE}" ] && \
+            cat <(printf "DEVICE_MODEL\tSERIAL\tBOARD_SERIAL\tUUID\tMAC_ADDRESS\tWIDTH\tHEIGHT\n") "${TSV_SERIAL_SETS_FILE}"
+
 }
 
 main () {
     # setting default variables if there are no options
+    export DATE_NOW="$(date +%F-%T)"
     export DEVICE_MODEL="${DEVICE_MODEL:=iMacPro1,1}"
+    export VENDOR_REGEX="${VENDOR_REGEX:=Apple, Inc.}"
     export SERIAL_SET_COUNT="${SERIAL_SET_COUNT:=1}"
     export OUTPUT_DIRECTORY="${OUTPUT_DIRECTORY:=.}"
     cat <<EOF
@@ -275,8 +379,8 @@ DEVICE_MODEL:       ${DEVICE_MODEL}
 SERIAL_SET_COUNT:   ${SERIAL_SET_COUNT}
 OUTPUT_DIRECTORY:   ${OUTPUT_DIRECTORY}
 EOF
-    [[ -d "${OUTPUT_DIRECTORY}" ]] || mkdir -p "${OUTPUT_DIRECTORY}"
-    [[ -e ./macserial ]] || build_mac_serial
+    [ -d "${OUTPUT_DIRECTORY}" ] || mkdir -p "${OUTPUT_DIRECTORY}"
+    [ -e ./macserial ] || build_mac_serial
     download_vendor_mac_addresses
     download_qcow_efi_folder
     generate_serial_sets

custom/opencore-image-ng.sh

@@ -89,7 +89,7 @@ function fish_fini() {
 	fish umount-all
 }
 
-# disabled by sick.codes to allow unattended image overwrites
+# disabled by @sickcodes to allow unattended image overwrites
 ######################################################################
 # sanity checks
 

helm/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.0.1.0"
 description: "Containerized OSX! Run OSX in a pod, headlessly, or with Xvfb. Test your Apps and master CI/CD processes."
 name: docker-osx
-version: 0.1.0
+version: 0.2.0
 keywords:
 - docker-osx
 - mac

helm/index.yaml

@@ -3,9 +3,9 @@ entries:
   docker-osx:
   - apiVersion: v1
     appVersion: 0.0.1.0
-    created: "2021-02-12T18:10:08.054368621Z"
+    created: "2021-02-27T04:15:48.784861502Z"
     description: Containerized OSX! Run OSX in a pod, headlessly, or with Xvfb. Test your Apps and master CI/CD processes.
-    digest: 04e88d78156fa1de709a3dad16558cb8f0bd1c1f0bde8144d530c9a0c143123a
+    digest: 5a62a9291b1494b9cfaa0708ab7bab9d13cca30adbeaced3d29a5bb6935caac9
     keywords:
     - docker-osx
     - mac
@@ -19,6 +19,6 @@ entries:
     - osx
     name: docker-osx
     urls:
-    - https://sickcodes.github.io/Docker-OSX/helm/docker-osx-0.1.0.tgz
-    version: 0.1.0
-generated: "2021-02-12T18:10:08.053067083Z"
+    - https://sickcodes.github.io/Docker-OSX/helm/docker-osx-0.2.0.tgz
+    version: 0.2.0
+generated: "2021-02-27T04:15:48.782073839Z"