Add NETDEV. Soft rename NETWORKING to NETWORKING_DEVICE

2025-07-02 18:53:31 -05:00 · 2021-09-18 10:34:38 +00:00
18 changed files with 350 additions and 685 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,6 @@
 |Version|Date|Notes|
 |---|---|---|
+|   |2021-09-18|Add `-e NETDEV=`|
 |   |2021-09-09|Add Monterey|
 |   |2021-08-27|Add iPhone passthrough OTA!|
 |6.0|2021-08-25|Added naked-auto. Keep kernel at 5.13, even tho it's just for supermin.|
--- a/CREDITS.md
+++ b/CREDITS.md
@ -92,8 +92,4 @@ This project now uses the fantastic OpenCore bootloader from the community OpenC

 [@cybik](https://github.com/cybik) Spice fix #337

-[@Silfalion](https://github.com/Silfalion) - [https://github.com/Silfalion/Iphone_docker_osx_passthrough](https://github.com/Silfalion/Iphone_docker_osx_passthrough)
-
-[@Buthrakaur](https://github.com/Buthrakaur) readme - improve instructions for running on windows #361
-
-[@eggplants](https://github.com/eggplants)  Fix command to launch sickcodes/docker-osx:auto #366 
+[@Silfalion](https://github.com/Silfalion) - [https://github.com/Silfalion/Iphone_docker_osx_passthrough](https://github.com/Silfalion/Iphone_docker_osx_passthrough)
--- a/144
+++ b/144
@ -52,12 +52,14 @@
 #       # you will also need to pass the device to the container

 FROM archlinux:base-devel
-LABEL maintainer='https://twitter.com/sickcodes <https://sick.codes>'
+
+MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes>

 SHELL ["/bin/bash", "-c"]

 # change disk size here or add during build, e.g. --build-arg VERSION=10.14.5 --build-arg SIZE=50G
 ARG SIZE=200G
+ARG VERSION=10.15.6

 # OPTIONAL: Arch Linux server mirrors for super fast builds
 # set RANKMIRRORS to any value other that nothing, e.g. -e RANKMIRRORS=true
@ -138,18 +140,32 @@ 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 bc qemu libvirt dnsmasq virt-manager bridge-utils openresolv jack ebtables edk2-ovmf netctl libvirt-dbus wget --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

 WORKDIR /home/arch/OSX-KVM

-# RUN wget https://raw.githubusercontent.com/kholia/OSX-KVM/master/fetch-macOS-v2.py
+RUN wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/fetch-macOS.py

-ARG SHORTNAME=catalina
+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

-RUN make \
-    && qemu-img convert BaseSystem.dmg -O qcow2 -p -c BaseSystem.img \
-    && rm ./BaseSystem.dmg
+# 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
+
+WORKDIR /home/arch/OSX-KVM

 ARG LINUX=true

@ -184,14 +200,14 @@ RUN touch Launch.sh \
    && tee -a Launch.sh <<< '-smbios type=2 \' \
    && tee -a Launch.sh <<< '-audiodev ${AUDIO_DRIVER:-alsa},id=hda -device ich9-intel-hda -device hda-duplex,audiodev=hda \' \
    && tee -a Launch.sh <<< '-device ich9-ahci,id=sata \' \
-    && tee -a Launch.sh <<< '-drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file=${BOOTDISK:-/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2} \' \
+    && tee -a Launch.sh <<< '-drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file=${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2} \' \
    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.2,drive=OpenCoreBoot \' \
    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.3,drive=InstallMedia \' \
-    && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=${BASESYSTEM_FORMAT} \' \
+    && 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=${IMAGE_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,${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 <<< '-netdev ${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_DEVICE:-vmxnet3},netdev=net0,id=net0,mac=${MAC_ADDRESS:-52:54:00:09:49:17} \' \
    && tee -a Launch.sh <<< '-monitor stdio \' \
    && tee -a Launch.sh <<< '-boot menu=on \' \
    && tee -a Launch.sh <<< '-vga vmware \' \
@ -200,102 +216,34 @@ RUN touch Launch.sh \
 # docker exec containerid mv ./Launch-nopicker.sh ./Launch.sh
 # This is now a legacy command.
 # You can use -e BOOTDISK=/bootdisk with -v ./bootdisk.img:/bootdisk
-
-### LEGACY CODE
 RUN grep -v InstallMedia ./Launch.sh > ./Launch-nopicker.sh \
    && chmod +x ./Launch-nopicker.sh \
    && sed -i -e s/OpenCore\.qcow2/OpenCore\-nopicker\.qcow2/ ./Launch-nopicker.sh
-###

 USER arch

 ENV USER arch

-#### libguestfs versioning
-
-# 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6
-
+# 5.13 problem
 ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
+
 ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
+
 ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
-ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
-ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
-ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst

-# fix ad hoc errors from using the arch museum to get libguestfs
-RUN sudo sed -i -e 's/^\#RemoteFileSigLevel/RemoteFileSigLevel/g' /etc/pacman.conf
-
-RUN sudo pacman -Syy \
-    && sudo pacman -Rns linux --noconfirm \
+RUN sudo pacman -Rns linux --noconfirm \
+    ; sudo pacman -Syy \
    ; sudo pacman -S mkinitcpio --noconfirm \
-    && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm || exit 1 \
-    && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm || exit 1 \
-    && rm -rf /var/tmp/.guestfs-* \
-    && yes | sudo pacman -Scc \
-    && libguestfs-test-tool || exit 1 \
-    && rm -rf /var/tmp/.guestfs-*
-
-####
-
-# These are hardcoded serials for non-iMessage related research
-# Overwritten by using GENERATE_UNIQUE=true
-# Upstream removed nopicker, so we are adding it back in, at build time
-# Once again, this is just for the Docker build so there is a default nopicker image there
-
-# libguestfs verbose
-ENV LIBGUESTFS_DEBUG=1
-ENV LIBGUESTFS_TRACE=1
-
-ARG STOCK_DEVICE_MODEL=iMacPro1,1
-ARG STOCK_SERIAL=C02TM2ZBHX87
-ARG STOCK_BOARD_SERIAL=C02717306J9JG361M
-ARG STOCK_UUID=007076A6-F2A2-4461-BBE5-BAD019F8025A
-ARG STOCK_MAC_ADDRESS=00:0A:27:00:00:00
-ARG STOCK_WIDTH=1920
-ARG STOCK_HEIGHT=1080
-ARG STOCK_MASTER_PLIST_URL=https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist
-ARG STOCK_MASTER_PLIST_URL_NOPICKER=https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist
-ARG STOCK_BOOTDISK=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2
-ARG STOCK_BOOTDISK_NOPICKER=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2
-
-RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-    --master-plist-url="${STOCK_MASTER_PLIST_URL}" \
-    --model "${STOCK_DEVICE_MODEL}" \
-    --serial "${STOCK_SERIAL}" \
-    --board-serial "${STOCK_BOARD_SERIAL}" \
-    --uuid "${STOCK_UUID}" \
-    --mac-address "${STOCK_MAC_ADDRESS}" \
-    --width "${STOCK_WIDTH}" \
-    --height "${STOCK_HEIGHT}" \
-    --output-bootdisk "${STOCK_BOOTDISK}" || exit 1 \
-    ; rm -rf /var/tmp/.guestfs-*
-
-RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-    --master-plist-url="${STOCK_MASTER_PLIST_URL_NOPICKER}" \
-    --model "${STOCK_DEVICE_MODEL}" \
-    --serial "${STOCK_SERIAL}" \
-    --board-serial "${STOCK_BOARD_SERIAL}" \
-    --uuid "${STOCK_UUID}" \
-    --mac-address "${STOCK_MAC_ADDRESS}" \
-    --width "${STOCK_WIDTH}" \
-    --height "${STOCK_HEIGHT}" \
-    --output-bootdisk "${STOCK_BOOTDISK_NOPICKER}" || exit 1 \
-    ; rm -rf /var/tmp/.guestfs-*
-
-### symlink the old directory as upstream has renamed a directory. Symlinking purely for backwards compatability!
-RUN ln -s /home/arch/OSX-KVM/OpenCore /home/arch/OSX-KVM/OpenCore-Catalina || true
-####
+    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
+    ; sudo rm -rf /var/tmp/.guestfs-* \
+    ; libguestfs-test-tool

 #### SPECIAL RUNTIME ARGUMENTS BELOW
+
 # env -e ADDITIONAL_PORTS with a comma
 # for example, -e ADDITIONAL_PORTS=hostfwd=tcp::23-:23,
 ENV ADDITIONAL_PORTS=

-# since the Makefile uses raw, and raw uses the full disk amount
-# we want to use a compressed qcow2
-# ENV BASESYSTEM_FORMAT=raw
-ENV BASESYSTEM_FORMAT=qcow2
-
 # add additional QEMU boot arguments
 ENV BOOT_ARGS=

@ -323,8 +271,14 @@ ENV KVM='accel=kvm:tcg'

 ENV MASTER_PLIST_URL="https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist"

+# Add NETDEV for bridged networking option, see https://github.com/sickcodes/Docker-OSX/issues/72
+# ENV NETDEV='tap,id=net0,ifname=tap0,script=no,downscript=no'
+# ENV NETDEV='user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900,${ADDITIONAL_PORTS}'
+
 # ENV NETWORKING=e1000-82545em
+# renamed to NETWORKING_DEVICE, but not deprecated
 ENV NETWORKING=vmxnet3
+ENV NETWORKING_DEVICE="${NETWORKING}"

 # boolean for skipping the disk selection menu at in the boot process
 ENV NOPICKER=false
@ -339,6 +293,10 @@ ENV RAM=3
 ENV WIDTH=1920
 ENV HEIGHT=1080

+# libguestfs verbose
+ENV LIBGUESTFS_DEBUG=1
+ENV LIBGUESTFS_TRACE=1
+
 VOLUME ["/tmp/.X11-unix"]

 # check if /image is a disk image or a directory. This allows you to optionally use -v disk.img:/image
@ -357,16 +315,16 @@ VOLUME ["/tmp/.X11-unix"]
 # /bootdisk is a useful persistent place to store the 15Mb serial number bootdisk.

 # if you don't set any of the above:
-# the default serial numbers are already contained in ./OpenCore/OpenCore.qcow2
+# the default serial numbers are already contained in ./OpenCore-Catalina/OpenCore.qcow2
 # And the default serial numbers

 CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
    ; [[ "${NOPICKER}" == true ]] && { \
        sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
+        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
    ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
            --master-plist-url="${MASTER_PLIST_URL}" \
@ -375,7 +333,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --bootdisks \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
            --output-env "${ENV:=/env}" \
    || exit 1 ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@ -389,7 +347,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --mac-address "${MAC_ADDRESS}" \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
    || exit 1 ; } \
    ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh

--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@ -92,33 +92,19 @@ USER arch

 ENV USER arch

-
-#### libguestfs versioning
-
-# 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6
-
+# 5.13 problem
 ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
+
 ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
+
 ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
-ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
-ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
-ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst

-# fix ad hoc errors from using the arch museum to get libguestfs
-RUN sudo sed -i -e 's/^\#RemoteFileSigLevel/RemoteFileSigLevel/g' /etc/pacman.conf
-
-RUN sudo pacman -Syy \
-    && sudo pacman -Rns linux --noconfirm \
+RUN sudo pacman -Rns linux --noconfirm \
+    ; sudo pacman -Syy \
    ; sudo pacman -S mkinitcpio --noconfirm \
-    && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm || exit 1 \
-    && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm || exit 1 \
-    && rm -rf /var/tmp/.guestfs-* \
-    && yes | sudo pacman -Scc \
-    && libguestfs-test-tool || exit 1 \
-    && rm -rf /var/tmp/.guestfs-*
-
-####
-
+    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
+    ; sudo rm -rf /var/tmp/.guestfs-* \
+    ; libguestfs-test-tool

 WORKDIR /home/arch/OSX-KVM

@ -149,14 +135,6 @@ RUN if [[ "${COMPLETE}" ]]; then \
        && wget ${WGET_OPTIONS} -O /home/arch/OSX-KVM/mac_hdd_ng.img "${IMAGE_URL}" \
    ; fi

-
-####
-
-# symlink the old directory, for redundancy
-RUN ln -s /home/arch/OSX-KVM/OpenCore /home/arch/OSX-KVM/OpenCore-Catalina || true
-
-####
-
 #### SPECIAL RUNTIME ARGUMENTS BELOW

 ENV ADDITIONAL_PORTS=
@ -222,9 +200,9 @@ CMD echo "${BOILERPLATE}" \
    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
    ; [[ "${NOPICKER}" == true ]] && { \
        sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
+        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
    ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
            --master-plist-url="${MASTER_PLIST_URL}" \
@ -233,7 +211,7 @@ CMD echo "${BOILERPLATE}" \
            --bootdisks \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
            --output-env "${ENV:=/env}" \
    || exit 1 ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@ -247,7 +225,7 @@ CMD echo "${BOILERPLATE}" \
            --mac-address "${MAC_ADDRESS}" \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}"  \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}"  \
    || exit 1 ; } \
    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
        nohup Xvfb :99 -screen 0 1920x1080x16 \
--- a/Dockerfile.monterey
+++ b/Dockerfile.monterey
@ -39,32 +39,13 @@ RUN qemu-img create -f qcow2 /home/arch/OSX-KVM/mac_hdd_ng.img "${SIZE}"

 WORKDIR /home/arch/OSX-KVM

-#### libguestfs versioning
-
-# 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6
-
-ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
-ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
-ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
-ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
-ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
-ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
-
 ARG LINUX=true

 # required to use libguestfs inside a docker container, to create bootdisks for docker-osx on-the-fly
 RUN if [[ "${LINUX}" == true ]]; then \
-        sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \
-        ; sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \
-        ; sudo pacman -U "${KERNEL_HEADERS_PACKAGE_URL}" --noconfirm \
-        ; sudo pacman -S mkinitcpio --noconfirm \
-        ; sudo libguestfs-test-tool \
-        ; sudo rm -rf /var/tmp/.guestfs-* \
+        sudo pacman -Syu linux libguestfs --noconfirm \
    ; fi

-####
-
-
 # optional --build-arg to change branches for testing
 ARG BRANCH=master
 ARG REPO='https://github.com/sickcodes/Docker-OSX.git'
@ -92,7 +73,7 @@ RUN touch Launch.sh \
    && tee -a Launch.sh <<< '-smbios type=2 \' \
    && tee -a Launch.sh <<< '-audiodev ${AUDIO_DRIVER:-alsa},id=hda -device ich9-intel-hda -device hda-duplex,audiodev=hda \' \
    && tee -a Launch.sh <<< '-device ich9-ahci,id=sata \' \
-    && tee -a Launch.sh <<< '-drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file=${BOOTDISK:-/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2} \' \
+    && tee -a Launch.sh <<< '-drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file=${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2} \' \
    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.2,drive=OpenCoreBoot \' \
    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.3,drive=InstallMedia \' \
    && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=qcow2 \' \
@ -116,32 +97,19 @@ USER arch

 ENV USER arch

-
-#### libguestfs versioning
-
-# 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6
-
+# 5.13 problem
 ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
+
 ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
+
 ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
-ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
-ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
-ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst

-RUN sudo pacman -Syy \
-    && sudo pacman -Rns linux --noconfirm \
+RUN sudo pacman -Rns linux --noconfirm \
+    ; sudo pacman -Syy \
    ; sudo pacman -S mkinitcpio --noconfirm \
-    && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \
-    && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \
-    && rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool || exit 1
-
-####
-
-# symlink the old directory, for redundancy
-RUN ln -s /home/arch/OSX-KVM/OpenCore /home/arch/OSX-KVM/OpenCore-Catalina || true
-
-####
+    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
+    ; sudo rm -rf /var/tmp/.guestfs-* \
+    ; libguestfs-test-tool

 #### SPECIAL RUNTIME ARGUMENTS BELOW

@ -214,16 +182,16 @@ VOLUME ["/tmp/.X11-unix"]
 # /bootdisk is a useful persistent place to store the 15Mb serial number bootdisk.

 # if you don't set any of the above:
-# the default serial numbers are already contained in ./OpenCore/OpenCore.qcow2
+# the default serial numbers are already contained in ./OpenCore-Catalina/OpenCore.qcow2
 # And the default serial numbers

 CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
    ; [[ "${NOPICKER}" == true ]] && { \
        sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
+        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
    ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
            --master-plist-url="${MASTER_PLIST_URL}" \
@ -232,7 +200,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --bootdisks \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
            --output-env "${ENV:=/env}" \
    || exit 1 ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@ -246,7 +214,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --mac-address "${MAC_ADDRESS}" \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
    || exit 1 ; } \
    ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh

--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@ -30,22 +30,22 @@
 #       docker run -it --device /dev/kvm -p 50922:10022 -v ${PWD}/mac_hdd_ng.img:/image -e "DISPLAY=${DISPLAY:-:0.0}" -v /tmp/.X11-unix:/tmp/.X11-unix docker-osx:naked
 # 

-FROM archlinux:base-devel
-LABEL maintainer='https://twitter.com/sickcodes <https://sick.codes>'
+FROM sickcodes/docker-osx:latest

-SHELL ["/bin/bash", "-c"]
+MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes>

-# change disk size here or add during build, e.g. --build-arg VERSION=10.14.5 --build-arg SIZE=50G
-ARG SIZE=200G
+USER root
+
+WORKDIR /root
+
+RUN rm -f /home/arch/OSX-KVM/mac_hdd_ng.img

 # OPTIONAL: Arch Linux server mirrors for super fast builds
 # set RANKMIRRORS to any value other that nothing, e.g. -e RANKMIRRORS=true
 ARG RANKMIRRORS
 ARG MIRROR_COUNTRY=US
 ARG MIRROR_COUNT=10
-
-RUN if [[ "${RANKMIRRORS}" ]]; then \
-        { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
+RUN if [[ "${RANKMIRRORS}" ]]; then { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
        ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \
        ; wget -O- "https://www.archlinux.org/mirrorlist/?country=${MIRROR_COUNTRY:-US}&protocol=https&use_mirror_status=on" \
        | sed -e 's/^#Server/Server/' -e '/^#/d' \
@ -57,40 +57,11 @@ RUN if [[ "${RANKMIRRORS}" ]]; then \
        && cat /etc/pacman.d/mirrorlist \
    ; fi

-# This fails on hub.docker.com, useful for debugging in cloud
-# RUN [[ $(egrep -c '(svm|vmx)' /proc/cpuinfo) -gt 0 ]] || { echo KVM not possible on this host && exit 1; }
-
-# RUN tee -a /etc/pacman.conf <<< '[community-testing]' \
-#     && tee -a /etc/pacman.conf <<< 'Include = /etc/pacman.d/mirrorlist'
-
-RUN pacman -Syu git zip vim nano alsa-utils openssh --noconfirm \
-    && ln -s /bin/vim /bin/vi \
-    && useradd arch -p arch \
-    && tee -a /etc/sudoers <<< 'arch ALL=(ALL) NOPASSWD: ALL' \
-    && mkdir /home/arch \
-    && chown arch:arch /home/arch \
-    && yes | sudo pacman -Scc
-
-# allow ssh to container
-RUN mkdir -m 700 /root/.ssh \
-    && touch /root/.ssh/authorized_keys \
-    && chmod 644 /root/.ssh/authorized_keys \
-    && tee -a /etc/ssh/sshd_config <<< 'AllowTcpForwarding yes' \
-    && tee -a /etc/ssh/sshd_config <<< 'PermitTunnel yes' \
-    && tee -a /etc/ssh/sshd_config <<< 'X11Forwarding yes' \
-    && tee -a /etc/ssh/sshd_config <<< 'PasswordAuthentication yes' \
-    && tee -a /etc/ssh/sshd_config <<< 'PermitRootLogin yes' \
-    && tee -a /etc/ssh/sshd_config <<< 'PubkeyAuthentication yes' \
-    && tee -a /etc/ssh/sshd_config <<< 'HostKey /etc/ssh/ssh_host_rsa_key' \
-    && tee -a /etc/ssh/sshd_config <<< 'HostKey /etc/ssh/ssh_host_ecdsa_key' \
-    && tee -a /etc/ssh/sshd_config <<< 'HostKey /etc/ssh/ssh_host_ed25519_key'
-
 # For taking screenshots of the Xfvb screen, useful during development.
 ARG SCROT

-# the following code only runs if --build-arg SCROT=true is used
 RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
-    && if [[ "${SCROT}" == true ]]; then \
+    && if [[ "${SCROT}" ]]; then \
        pacman -Syu scrot base-devel --noconfirm \
        && git clone --recurse-submodules --depth 1 https://github.com/stolk/imcat.git \
        && cd imcat \
@ -110,173 +81,19 @@ USER arch

 ENV USER arch

-# download OSX-KVM
-# RUN git clone --recurse-submodules --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
-
-WORKDIR /home/arch/OSX-KVM
-
-RUN touch enable-ssh.sh \
-    && chmod +x ./enable-ssh.sh \
-    && tee -a enable-ssh.sh <<< '[[ -f /etc/ssh/ssh_host_rsa_key ]] || \' \
-    && tee -a enable-ssh.sh <<< '[[ -f /etc/ssh/ssh_host_ed25519_key ]] || \' \
-    && tee -a enable-ssh.sh <<< '[[ -f /etc/ssh/ssh_host_ed25519_key ]] || \' \
-    && tee -a enable-ssh.sh <<< 'sudo /usr/bin/ssh-keygen -A' \
-    && tee -a enable-ssh.sh <<< 'nohup sudo /usr/bin/sshd -D &'
-
-# QEMU CONFIGURATOR
-# set optional ram at runtime -e RAM=16
-# set optional cores at runtime -e SMP=4 -e CORES=2
-# add any additional commands in QEMU cli format -e EXTRA="-usb -device usb-host,hostbus=1,hostaddr=8"
-
-# default env vars, RUNTIME ONLY, not for editing in build time.
-
-# RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils edk2-ovmf netctl libvirt-dbus --overwrite --noconfirm
-
-RUN yes | sudo pacman -Syu bc qemu libvirt dnsmasq virt-manager bridge-utils openresolv jack ebtables edk2-ovmf netctl libvirt-dbus wget --overwrite --noconfirm \
-    && yes | sudo pacman -Scc
-
-WORKDIR /home/arch/OSX-KVM
-
-# we still want a recovery disk, monterey is backwards compatible (APFS), however, the Catalina and below are not (HFS+).
-ARG SHORTNAME=monterey
-
-RUN make \
-    && qemu-img convert BaseSystem.dmg -O qcow2 -p -c BaseSystem.img \
-    && rm ./BaseSystem.dmg
-
-ARG LINUX=true
-
-# required to use libguestfs inside a docker container, to create bootdisks for docker-osx on-the-fly
-RUN if [[ "${LINUX}" == true ]]; then \
-        sudo pacman -Syu linux libguestfs --noconfirm \
-        && yes | sudo pacman -Scc \
-    ; fi
-
-# 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}"
-RUN git clone --recurse-submodules --depth 1 --branch "${BRANCH}" "${REPO}"
-
-RUN touch Launch.sh \
-    && chmod +x ./Launch.sh \
-    && tee -a Launch.sh <<< '#!/bin/bash' \
-    && tee -a Launch.sh <<< 'set -eux' \
-    && 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 <<< '[[ "${RAM}" = max ]] && export RAM="$(("$(head -n1 /proc/meminfo | tr -dc "[:digit:]") / 1000000"))"' \
-    && tee -a Launch.sh <<< '[[ "${RAM}" = half ]] && export RAM="$(("$(head -n1 /proc/meminfo | tr -dc "[:digit:]") / 2000000"))"' \
-    && 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:-2}000 \' \
-    && tee -a Launch.sh <<< '-cpu ${CPU:-Penryn},${CPUID_FLAGS:-vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,}${BOOT_ARGS} \' \
-    && tee -a Launch.sh <<< '-machine q35,${KVM-"accel=kvm:tcg"} \' \
-    && tee -a Launch.sh <<< '-smp ${CPU_STRING:-${SMP:-4},cores=${CORES:-4}} \' \
-    && tee -a Launch.sh <<< '-usb -device usb-kbd -device usb-tablet \' \
-    && tee -a Launch.sh <<< '-device isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal\(c\)AppleComputerInc \' \
-    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,readonly=on,file=/home/arch/OSX-KVM/OVMF_CODE.fd \' \
-    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,file=/home/arch/OSX-KVM/OVMF_VARS-1024x768.fd \' \
-    && tee -a Launch.sh <<< '-smbios type=2 \' \
-    && tee -a Launch.sh <<< '-audiodev ${AUDIO_DRIVER:-alsa},id=hda -device ich9-intel-hda -device hda-duplex,audiodev=hda \' \
-    && tee -a Launch.sh <<< '-device ich9-ahci,id=sata \' \
-    && tee -a Launch.sh <<< '-drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file=${BOOTDISK:-/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2} \' \
-    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.2,drive=OpenCoreBoot \' \
-    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.3,drive=InstallMedia \' \
-    && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=${BASESYSTEM_FORMAT} \' \
-    && tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=${IMAGE_PATH:-/home/arch/OSX-KVM/mac_hdd_ng.img},format=${IMAGE_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,${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 <<< '-boot menu=on \' \
-    && tee -a Launch.sh <<< '-vga vmware \' \
-    && tee -a Launch.sh <<< '${EXTRA:-}'
-
-# docker exec containerid mv ./Launch-nopicker.sh ./Launch.sh
-# This is now a legacy command.
-# You can use -e BOOTDISK=/bootdisk with -v ./bootdisk.img:/bootdisk
-
-### LEGACY CODE
-RUN grep -v InstallMedia ./Launch.sh > ./Launch-nopicker.sh \
-    && chmod +x ./Launch-nopicker.sh \
-    && sed -i -e s/OpenCore\.qcow2/OpenCore\-nopicker\.qcow2/ ./Launch-nopicker.sh
-###
-
-USER arch
-
-ENV USER arch
-
-#### libguestfs versioning
-
-# 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6
-
+# 5.13 problem
 ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
+
 ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
+
 ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
-ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
-ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
-ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst

-# fix ad hoc errors from using the arch museum to get libguestfs
-RUN sudo sed -i -e 's/^\#RemoteFileSigLevel/RemoteFileSigLevel/g' /etc/pacman.conf
-
-RUN sudo pacman -Syy \
-    && sudo pacman -Rns linux --noconfirm \
+RUN sudo pacman -Rns linux --noconfirm \
+    ; sudo pacman -Syy \
    ; sudo pacman -S mkinitcpio --noconfirm \
-    && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm || exit 1 \
-    && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm || exit 1 \
-    && rm -rf /var/tmp/.guestfs-* \
-    && yes | sudo pacman -Scc \
-    && libguestfs-test-tool || exit 1 \
-    && rm -rf /var/tmp/.guestfs-*
-
-####
-
-# These are hardcoded serials for non-iMessage related research
-# Overwritten by using GENERATE_UNIQUE=true
-# Upstream removed nopicker, so we are adding it back in, at build time
-# Once again, this is just for the Docker build so there is a default nopicker image there
-
-# libguestfs verbose
-ENV LIBGUESTFS_DEBUG=1
-ENV LIBGUESTFS_TRACE=1
-
-ARG STOCK_DEVICE_MODEL=iMacPro1,1
-ARG STOCK_SERIAL=C02TM2ZBHX87
-ARG STOCK_BOARD_SERIAL=C02717306J9JG361M
-ARG STOCK_UUID=007076A6-F2A2-4461-BBE5-BAD019F8025A
-ARG STOCK_MAC_ADDRESS=00:0A:27:00:00:00
-ARG STOCK_WIDTH=1920
-ARG STOCK_HEIGHT=1080
-ARG STOCK_MASTER_PLIST_URL=https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist
-ARG STOCK_MASTER_PLIST_URL_NOPICKER=https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist
-ARG STOCK_BOOTDISK=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2
-ARG STOCK_BOOTDISK_NOPICKER=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2
-
-RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-    --master-plist-url="${STOCK_MASTER_PLIST_URL}" \
-    --model "${STOCK_DEVICE_MODEL}" \
-    --serial "${STOCK_SERIAL}" \
-    --board-serial "${STOCK_BOARD_SERIAL}" \
-    --uuid "${STOCK_UUID}" \
-    --mac-address "${STOCK_MAC_ADDRESS}" \
-    --width "${STOCK_WIDTH}" \
-    --height "${STOCK_HEIGHT}" \
-    --output-bootdisk "${STOCK_BOOTDISK}" || exit 1 \
-    ; rm -rf /var/tmp/.guestfs-*
-
-RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-    --master-plist-url="${STOCK_MASTER_PLIST_URL_NOPICKER}" \
-    --model "${STOCK_DEVICE_MODEL}" \
-    --serial "${STOCK_SERIAL}" \
-    --board-serial "${STOCK_BOARD_SERIAL}" \
-    --uuid "${STOCK_UUID}" \
-    --mac-address "${STOCK_MAC_ADDRESS}" \
-    --width "${STOCK_WIDTH}" \
-    --height "${STOCK_HEIGHT}" \
-    --output-bootdisk "${STOCK_BOOTDISK_NOPICKER}" || exit 1 \
-    ; rm -rf /var/tmp/.guestfs-*
-
+    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
+    ; sudo rm -rf /var/tmp/.guestfs-* \
+    ; libguestfs-test-tool

 WORKDIR /home/arch/OSX-KVM

@ -290,13 +107,8 @@ RUN mkdir -p ~/.ssh \
    && tee -a ~/.ssh/config <<< '    StrictHostKeyChecking no' \
    && tee -a ~/.ssh/config <<< '    UserKnownHostsFile=/dev/null'

-### symlink the old directory as upstream has renamed a directory. Symlinking purely for backwards compatability!
-RUN ln -s /home/arch/OSX-KVM/OpenCore /home/arch/OSX-KVM/OpenCore-Catalina || true
-####
-
 #### SPECIAL RUNTIME ARGUMENTS BELOW
-# env -e ADDITIONAL_PORTS with a comma
-# for example, -e ADDITIONAL_PORTS=hostfwd=tcp::23-:23,
+
 ENV ADDITIONAL_PORTS=

 # add additional QEMU boot arguments
@ -304,13 +116,13 @@ ENV BOOT_ARGS=

 ENV BOOTDISK=

-# edit the CPU that is being emulated
+# edit the CPU that is beign emulated
 ENV CPU=Penryn
-ENV CPUID_FLAGS='vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,'

-ENV DISPLAY=:0.0
+ENV DISPLAY=:99
+
+ENV HEADLESS=false

-# Deprecated
 ENV ENV=/env

 # Boolean for generating a bootdisk with new random serials.
@ -341,26 +153,9 @@ ENV RAM=3
 ENV WIDTH=1920
 ENV HEIGHT=1080

-VOLUME ["/tmp/.X11-unix"]
-
-# check if /image is a disk image or a directory. This allows you to optionally use -v disk.img:/image
-# NOPICKER is used to skip the disk selection screen
-# GENERATE_UNIQUE is used to generate serial numbers on boot.
-# /env is a file that you can generate and save using -v source.sh:/env
-# the env file is a file that you can carry to the next container which will supply the serials numbers.
-# GENERATE_SPECIFIC is used to either accept the env serial numbers OR you can supply using:
-    # -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" \
-
-# the output will be /bootdisk.
-# /bootdisk is a useful persistent place to store the 15Mb serial number bootdisk.
-
-# if you don't set any of the above:
-# the default serial numbers are already contained in ./OpenCore/OpenCore.qcow2
-# And the default serial numbers
+# libguestfs verbose
+ENV LIBGUESTFS_DEBUG=1
+ENV LIBGUESTFS_TRACE=1

 CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
@ -370,9 +165,9 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
    ; } \
    ; [[ "${NOPICKER}" == true ]] && { \
        sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
+        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
    ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
            --master-plist-url="${MASTER_PLIST_URL}" \
@ -381,7 +176,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --bootdisks \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
            --output-env "${ENV:=/env}" \
    || exit 1 ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@ -395,6 +190,6 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --mac-address "${MAC_ADDRESS}" \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
    || exit 1 ; } \
    ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
--- a/Dockerfile.naked-auto
+++ b/Dockerfile.naked-auto
@ -73,32 +73,19 @@ USER arch

 ENV USER arch

-#### libguestfs versioning
-
-# 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6
-
+# 5.13 problem
 ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
+
 ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
+
 ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
-ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
-ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
-ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst

-# fix ad hoc errors from using the arch museum to get libguestfs
-RUN sudo sed -i -e 's/^\#RemoteFileSigLevel/RemoteFileSigLevel/g' /etc/pacman.conf
-
-RUN sudo pacman -Syy \
-    && sudo pacman -Rns linux --noconfirm \
+RUN sudo pacman -Rns linux --noconfirm \
+    ; sudo pacman -Syy \
    ; sudo pacman -S mkinitcpio --noconfirm \
-    && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm || exit 1 \
-    && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm || exit 1 \
-    && rm -rf /var/tmp/.guestfs-* \
-    && yes | sudo pacman -Scc \
-    && libguestfs-test-tool || exit 1 \
-    && rm -rf /var/tmp/.guestfs-*
-
-####
-
+    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
+    ; sudo rm -rf /var/tmp/.guestfs-* \
+    ; libguestfs-test-tool

 WORKDIR /home/arch/OSX-KVM

@ -129,13 +116,6 @@ RUN if [[ "${COMPLETE}" ]]; then \
        && wget ${WGET_OPTIONS} -O /home/arch/OSX-KVM/mac_hdd_ng.img "${IMAGE_URL}" \
    ; fi

-####
-
-# symlink the old directory, for redundancy
-RUN ln -s /home/arch/OSX-KVM/OpenCore /home/arch/OSX-KVM/OpenCore-Catalina || true
-
-####
-
 #### SPECIAL RUNTIME ARGUMENTS BELOW

 ENV ADDITIONAL_PORTS=
@ -201,9 +181,9 @@ CMD echo "${BOILERPLATE}" \
    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
    ; [[ "${NOPICKER}" == true ]] && { \
        sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
+        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
    ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
            --master-plist-url="${MASTER_PLIST_URL}" \
@ -212,7 +192,7 @@ CMD echo "${BOILERPLATE}" \
            --bootdisks \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
            --output-env "${ENV:=/env}" \
    || exit 1 ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@ -226,7 +206,7 @@ CMD echo "${BOILERPLATE}" \
            --mac-address "${MAC_ADDRESS}" \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
    || exit 1 ; } \
    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
        nohup Xvfb :99 -screen 0 1920x1080x16 \
--- a/README.md
+++ b/README.md
@ -8,14 +8,9 @@ Run Mac OS X in Docker with near-native performance! X11 Forwarding! iMessage se

 The Discord is active on #docker-osx and anyone is welcome to come and ask questions, ideas, etc.

-<p align="center">
-    <a href="https://hub.docker.com/r/sickcodes/docker-osx"><img src="https://dockeri.co/image/sickcodes/docker-osx"/></a><a href="https://discord.gg/sickchat"><a href="https://discord.gg/sickchat" target="_blank"><img src="https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/discord-logo.svg"></a></a>
-</p>
+[![https://discord.gg/mx8pPw39Yg](/discord-logo.svg?raw=true "Join Sick Codes Discord Server")](https://discord.gg/mx8pPw39Yg)

-
-
-
-### Click to join the Discord server [https://discord.gg/sickchat](https://discord.gg/sickchat)
+### Click to join the Discord server [https://discord.gg/mx8pPw39Yg](https://discord.gg/mx8pPw39Yg)

 ### Click to join the Telegram server [https://t.me/sickcodeschat](https://t.me/sickcodeschat)

@ -39,18 +34,14 @@ Extra special thanks to the OpenCore team over at: https://github.com/acidanther

 If you like this project, consider contributing here or upstream!

+<a href="https://hub.docker.com/r/sickcodes/docker-osx"><img src="https://dockeri.co/image/sickcodes/docker-osx"/></a>
+
 ## Quick Start Docker-OSX

-Video setup tutorial is also available here: https://www.youtube.com/watch?v=wLezYl77Ll8
-
-<p align="center">
-  <a href="https://www.youtube.com/watch?v=wLezYl77Ll8" target="_blank"><img src="https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/Youtube-Screenshot-Docker-OSX-Setup.png"></a>
-</p>
-
 First time here? try [initial setup](#initial-setup), otherwise try the instructions below to use either Catalina or Big Sur.

 ## Any questions, ideas, or just want to hang out?
-# [https://discord.gg/sickchat](https://discord.gg/sickchat)
+# [https://discord.gg/mx8pPw39Yg](https://discord.gg/mx8pPw39Yg)

 ### Catalina [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/latest?label=sickcodes%2Fdocker-osx%3Alatest](https://img.shields.io/docker/image-size/sickcodes/docker-osx/latest?label=sickcodes%2Fdocker-osx%3Alatest)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)

@ -74,7 +65,7 @@ docker run -it \
    -e "DISPLAY=${DISPLAY:-:0.0}" \
    sickcodes/docker-osx:big-sur

-# docker build -t docker-osx --build-arg SHORTNAME=big-sur .
+# docker build -t docker-osx -e VERSION='Big Sur' .
 ```

 ### Monterey [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/monterey?label=sickcodes%2Fdocker-osx%3Amonterey](https://img.shields.io/docker/image-size/sickcodes/docker-osx/monterey?label=sickcodes%2Fdocker-osx%3Amonterey)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)
@ -90,7 +81,7 @@ docker run -it \
    -e MASTER_PLIST_URL='https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist' \
    sickcodes/docker-osx:monterey

-# docker build -t docker-osx --build-arg SHORTNAME=monterey .
+# docker build -t docker-osx -f Dockerfile.monterey .
 ```

 #### Run Catalina Pre-Installed [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/auto?label=sickcodes%2Fdocker-osx%3Aauto](https://img.shields.io/docker/image-size/sickcodes/docker-osx/auto?label=sickcodes%2Fdocker-osx%3Aauto)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)
@ -105,45 +96,12 @@ docker run -it \
    -p 50922:10022 \
    -v /tmp/.X11-unix:/tmp/.X11-unix \
    -e "DISPLAY=${DISPLAY:-:0.0}" \
-    -e GENERATE_UNIQUE=true \
    sickcodes/docker-osx:auto

 # username is user
 # passsword is alpine
 ```

-### Older Systems
-
-### High Sierra [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/high-sierra?label=sickcodes%2Fdocker-osx%3Ahigh-sierra](https://img.shields.io/docker/image-size/sickcodes/docker-osx/high-sierra?label=sickcodes%2Fdocker-osx%3Ahigh-sierra)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)
-
-```bash
-
-docker run -it \
-    --device /dev/kvm \
-    -p 50922:10022 \
-    -v /tmp/.X11-unix:/tmp/.X11-unix \
-    -e "DISPLAY=${DISPLAY:-:0.0}" \
-    sickcodes/docker-osx:high-sierra
-
-# docker build -t docker-osx --build-arg SHORTNAME=high-sierra .
-```
-
-### Mojave [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/mojave?label=sickcodes%2Fdocker-osx%3Amojave](https://img.shields.io/docker/image-size/sickcodes/docker-osx/mojave?label=sickcodes%2Fdocker-osx%3Amojave)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)
-
-```bash
-
-docker run -it \
-    --device /dev/kvm \
-    -p 50922:10022 \
-    -v /tmp/.X11-unix:/tmp/.X11-unix \
-    -e "DISPLAY=${DISPLAY:-:0.0}" \
-    sickcodes/docker-osx:mojave
-
-# docker build -t docker-osx --build-arg SHORTNAME=mojave .
-```
-
-
-
 #### Download the image manually and use it in Docker 

 [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/naked?label=sickcodes%2Fdocker-osx%3Anaked](https://img.shields.io/docker/image-size/sickcodes/docker-osx/naked?label=sickcodes%2Fdocker-osx%3Anaked)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)
@ -287,44 +245,31 @@ SEE commands in [https://github.com/sickcodes/osx-optimizer](https://github.com/

 ## Important notices:

-**2021-11-14** - Added High Sierra, Mojave
+**2021-09-09** - Bootdisks at runtime required for Monterey!

-Pick one of these while **building**, irrelevant when using docker pull:
+Pick one of these:
 ```
--build-arg SHORTNAME=high-sierra 
--build-arg SHORTNAME=mojave
--build-arg SHORTNAME=catalina
--build-arg SHORTNAME=big-sur
--build-arg SHORTNAME=monterey
+    -e MASTER_PLIST_URL='https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist' \
+
+    -e MASTER_PLIST_URL='https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist' \
 ```


 ## Technical details

-There currently multiple images, each with different use cases (explained [below](#container-images)):
+There currently five images, each with different use cases (explained [below](#container-images)):

- High Sierra
- Mojave
 - Catalina
 - Big Sur
- Monterey
 - Auto (pre-made Catalina)
 - Naked (use your own .img)
 - Naked-Auto (user your own .img and SSH in)

-High Sierra:
-
-[![https://img.shields.io/docker/image-size/sickcodes/docker-osx/high-sierra?label=sickcodes%2Fdocker-osx%3Ahigh-sierra](https://img.shields.io/docker/image-size/sickcodes/docker-osx/high-sierra?label=sickcodes%2Fdocker-osx%3Ahigh-sierra)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)
-
-Mojave:
-
-[![https://img.shields.io/docker/image-size/sickcodes/docker-osx/mojave?label=sickcodes%2Fdocker-osx%3Amojave](https://img.shields.io/docker/image-size/sickcodes/docker-osx/mojave?label=sickcodes%2Fdocker-osx%3Amojave)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)
-
-Catalina:
+Catalina make your own image:

 [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/latest?label=sickcodes%2Fdocker-osx%3Alatest](https://img.shields.io/docker/image-size/sickcodes/docker-osx/latest?label=sickcodes%2Fdocker-osx%3Alatest)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)

-Big-Sur:
+Big-Sur make your own image:

 [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/big-sur?label=sickcodes%2Fdocker-osx%3Abig-sur](https://img.shields.io/docker/image-size/sickcodes/docker-osx/big-sur?label=sickcodes%2Fdocker-osx%3Abig-sur)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)

@ -332,26 +277,25 @@ Monterey make your own image:

 [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/monterey?label=sickcodes%2Fdocker-osx%3Amonterey](https://img.shields.io/docker/image-size/sickcodes/docker-osx/monterey?label=sickcodes%2Fdocker-osx%3Amonterey)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)

-Pre-made **Catalina** system by [Sick.Codes](https://sick.codes): username: `user`, password: `alpine`
+Pre-made system by [Sick.Codes](https://sick.codes): username: `user`, password: `alpine`

 [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/auto?label=sickcodes%2Fdocker-osx%3Aauto](https://img.shields.io/docker/image-size/sickcodes/docker-osx/auto?label=sickcodes%2Fdocker-osx%3Aauto)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)

-Naked: Bring-your-own-image setup (use any of the above first):
+Bring-your-own-image setup (use any of the above first):

 [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/naked?label=sickcodes%2Fdocker-osx%3Anaked](https://img.shields.io/docker/image-size/sickcodes/docker-osx/naked?label=sickcodes%2Fdocker-osx%3Anaked)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)

-Naked Auto: same as above but with `-e USERNAME` & `-e PASSWORD` and `-e OSX_COMMANDS="put your commands here"`
+Same as above but with `-e USERNAME` & `-e PASSWORD` and `-e OSX_COMMANDS="put your commands here"`

 [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/naked-auto?label=sickcodes%2Fdocker-osx%3Anaked-auto](https://img.shields.io/docker/image-size/sickcodes/docker-osx/naked-auto?label=sickcodes%2Fdocker-osx%3Anaked-auto)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)

 ## Capabilities
- use iPhone OSX KVM on Linux using [usbfluxd](https://github.com/corellium/usbfluxd)!
- macOS Monterey VM on Linux!
- Folder sharing-
- USB passthrough (hotplug too)
+- use iPhone OSX KVM on Linux using usbfluxd!
+- macOS Monterey!
+- Folder sharing
 - SSH enabled (`localhost:50922`)
 - VNC enabled (`localhost:8888`) if using ./vnc version
- iMessage security research via [serial number generator!](https://github.com/sickcodes/osx-serial-generator)
+- [serial number generator!](https://github.com/sickcodes/osx-serial-generator)
 - X11 forwarding is enabled
 - runs on top of QEMU + KVM
 - supports Big Sur, custom images, Xvfb headless mode
@ -359,9 +303,9 @@ Naked Auto: same as above but with `-e USERNAME` & `-e PASSWORD` and `-e OSX_COM

 ### Requirements

- 20GB+++ disk space for bare minimum installation (50GB if using Xcode)
+- 20GB disk space for bare minimum installation
 - virtualization should be enabled in your BIOS settings
- a x86_64 kvm-capable host
+- a kvm-capable host
 - at least 50 GBs for `:auto` (half for the base image, half for your runtime image

 ### TODO
@ -445,9 +389,6 @@ Create your personal image using `:latest` or `big-sur`. Then, pull the image ou
 - `sickcodes/docker-osx:big-sur` - [I want to run Big Sur.](#quick-start-docker-osx)
 - `sickcodes/docker-osx:monterey` - [I want to run Monterey.](#quick-start-docker-osx)

- `sickcodes/docker-osx:high-sierra` - I want to run High Sierra.
- `sickcodes/docker-osx:mojave` - I want to run Mojave.
-
 ## Initial setup
 Before you do anything else, you will need to turn on hardware virtualization in your BIOS. Precisely how will depend on your particular machine (and BIOS), but it should be straightforward.

@ -477,7 +418,7 @@ sudo modprobe kvm

 ## Additional boot instructions for when you are [creating your container](#container-creation-examples)

- Boot the macOS Base System (Press Enter)
+- Boot the macOS Base System

 - Click `Disk Utility`

@ -488,8 +429,6 @@ sudo modprobe kvm

 - Click `Reinstall macOS`

- The system may require multiple reboots during installation
-
 ## Troubleshooting

 ### Routine checks
@ -540,9 +479,7 @@ This will use all available cores; adjust accordingly to the day of the week:

 This will use `-smp $(nproc)`

-### Confirm your user is part of the the Docker group, KVM group, libvirt group
-
-#### Add yourself to the Docker group
+#### Confirm your user is part of the the Docker group, KVM group, libvirt group

 If you use `sudo dockerd` or dockerd is controlled by systemd/systemctl, then you must be in the Docker group.
 If you are not in the Docker group:
@ -562,17 +499,17 @@ See also: [initial setup](#initial-setup).
 #### Is the docker daemon enabled?

 ```bash
-# run ad hoc
-sudo dockerd
-
-# or daemonize it
-sudo nohup dockerd &
-
 # enable it in systemd (it will persist across reboots this way)
 sudo systemctl enable --now docker

 # or just start it as your user with systemd instead of enabling it
 systemctl start docker
+
+# or run ad hoc
+sudo dockerd
+
+# or daemonize it
+sudo nohup dockerd &
 ```

 ## More Questions and Answers
@ -936,7 +873,7 @@ docker build -t docker-osx:latest \
    --build-arg RANKMIRRORS=true \
    --build-arg MIRROR_COUNTRY=US \
    --build-arg MIRROR_COUNT=10 \
-    --build-arg SHORTNAME=catalina \
+    --build-arg VERSION=10.15.6 \
    --build-arg SIZE=200G .
 ```

@ -1148,9 +1085,7 @@ Or tell the container to use specific ones using `-e GENERATE_SPECIFIC=true`
    -e MAC_ADDRESS="A8:5C:2C:9A:46:2F" \
 ```

-### I'd like to run Docker-OSX on Windows
-
-Running Docker-OSX on windows is possible just in WSL2 (Windows, Ubuntu).
+### I'd like to run Docker-OSX with WSL2 (Windows, Ubuntu)

 Ensure KVM is enabled and `x11-apps` is installed.

@ -1466,6 +1401,9 @@ docker run -it \
 # Boots in a minute or two!
 ```

+
+```bash
+
 OR if you have an image already and just want to log in and execute arbitrary commands:

 ```bash
--- a/Youtube-Screenshot-Docker-OSX-Setup.png
+++ b/Youtube-Screenshot-Docker-OSX-Setup.png
--- a/2
+++ b/2
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@ -0,0 +1,112 @@
+#!/usr/bin/docker
+#     ____             __             ____  ______  __
+#    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
+#   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   /
+#  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |
+# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_| TEST SUITE FOR TESTING SMALL CHANGES
+#
+# Title:            Docker-OSX (Mac on Docker)
+# Author:           Sick.Codes https://twitter.com/sickcodes
+# Version:          6.0
+# License:          GPLv3+
+# Repository:       https://github.com/sickcodes/Docker-OSX
+# Website:          https://sick.codes
+#
+
+FROM sickcodes/docker-osx:latest
+
+RUN echo "Replace me" && exit 1
+
+#### SPECIAL RUNTIME ARGUMENTS BELOW
+
+# env -e ADDITIONAL_PORTS with a comma
+# for example, -e ADDITIONAL_PORTS=hostfwd=tcp::23-:23,
+ENV ADDITIONAL_PORTS=
+
+# add additional QEMU boot arguments
+ENV BOOT_ARGS=
+
+ENV BOOTDISK=
+
+# edit the CPU that is being emulated
+ENV CPU=Penryn
+ENV CPUID_FLAGS='vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,'
+
+ENV DISPLAY=:0.0
+
+# Deprecated
+ENV ENV=/env
+
+# 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
+
+ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
+ENV IMAGE_FORMAT=qcow2
+
+ENV KVM='accel=kvm:tcg'
+
+ENV MASTER_PLIST_URL="https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist"
+
+# Add NETDEV for bridged networking option, see https://github.com/sickcodes/Docker-OSX/issues/72
+# ENV NETDEV='tap,id=net0,ifname=tap0,script=no,downscript=no'
+# ENV NETDEV='user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900,${ADDITIONAL_PORTS}'
+
+# ENV NETWORKING=e1000-82545em
+# renamed to NETWORKING_DEVICE, but not deprecated
+ENV NETWORKING=vmxnet3
+ENV NETWORKING_DEVICE=${NETWORKING}
+
+# boolean for skipping the disk selection menu at in the boot process
+ENV NOPICKER=false
+
+# dynamic RAM options for runtime
+ENV RAM=3
+# ENV RAM=max
+# ENV RAM=half
+
+# 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
+
+# libguestfs verbose
+ENV LIBGUESTFS_DEBUG=1
+ENV LIBGUESTFS_TRACE=1
+
+VOLUME ["/tmp/.X11-unix"]
+
+CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
+    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
+    ; [[ "${NOPICKER}" == true ]] && { \
+        sed -i '/^.*InstallMedia.*/d' Launch.sh \
+        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
+    ; } \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
+        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
+            --master-plist-url="${MASTER_PLIST_URL}" \
+            --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}" \
+    || exit 1 ; } \
+    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
+            source "${ENV:=/env}" 2>/dev/null \
+            ; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
+            --master-plist-url="${MASTER_PLIST_URL}" \
+            --model "${DEVICE_MODEL}" \
+            --serial "${SERIAL}" \
+            --board-serial "${BOARD_SERIAL}" \
+            --uuid "${UUID}" \
+            --mac-address "${MAC_ADDRESS}" \
+            --width "${WIDTH:-1920}" \
+            --height "${HEIGHT:-1080}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+    || exit 1 ; } \
+    ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
--- a/tests/big-sur_master.png
+++ b/tests/big-sur_master.png
--- a/tests/boot-images.sh
+++ b/tests/boot-images.sh
@ -1,67 +0,0 @@
-#!/bin/bash
-# Author:       Sick.Codes https://twitter.com/sickcodes
-# Contact:      https://github.com/sickcodes, https://sick.codes
-# Copyright:    sickcodes (C) 2021
-# License:      GPLv3+
-# Title:        Docker-OSX (Mac on Docker)
-# Repository:   https://github.com/sickcodes/Docker-OSX
-# Website:      https://sick.codes
-#
-# Status:       Used internally to run each image and take screenshots until they match the pngs in this folder.
-# 
-
-# note to self: # to get master images, boot each image, then screen shot using DISPLAY=:99 in the test.sh script
-# scrot -o high-sierra_master.png
-# scrot -o mojave_master.png
-# scrot -o catalina_master.png
-# scrot -o big-sur_master.png
-# scrot -o monterey_master.png
-# pull off remote server to the tests folder
-# REMOTE_SERVER=
-# scp root@"${REMOTE_SERVER}":~/*_master.png .
-
-export DISPLAY=:99
-
-TESTS=(
-    high-sierra
-    mojave
-    catalina
-    big-sur
-    monterey
-)
-
-# test each docker image to see if they boot to their unique respective installation screens.
-
-for TEST in "${TESTS[@]}"; do
-    # run the image detached
-    docker run --rm -d \
-        --device /dev/kvm \
-        -v /tmp/.X11-unix:/tmp/.X11-unix \
-        -e "DISPLAY=:99" \
-        "sickcodes/docker-osx:${TEST}"
-
-    # imcat the expected test screenshot to ./"${TEST}_master.txt" 
-    imcat ~/Docker-OSX/tests/${TEST}_master.png > ./"${TEST}_master.txt"
-
-    # run until the screen matches the expected screen
-    while :; do
-        sleep 5
-        # screenshot the Xvfb
-        scrotcat > ./"${TEST}.txt"
-        # diff the low res txt files created from imcat
-        diff "./${TEST}.txt" ./"${TEST}_master.txt" && break
-        scrotcat
-    done
-
-    # kill any containers
-    docker kill "$(docker ps --format "{{.ID}}")"
-    
-    # ensure all containers are dead
-    until [[ "$(docker ps | wc -l)" = 1 ]]; do
-        sleep 1
-        docker ps | xargs docker kill
-    done
-
-done
-
-exit 0
--- a/tests/catalina_master.png
+++ b/tests/catalina_master.png
--- a/tests/high-sierra_master.png
+++ b/tests/high-sierra_master.png
--- a/tests/mojave_master.png
+++ b/tests/mojave_master.png
--- a/tests/monterey_master.png
+++ b/tests/monterey_master.png
--- a/tests/test.sh
+++ b/tests/test.sh
@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/docker
 #     ____             __             ____  ______  __
 #    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
 #   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   /
@ -12,7 +12,7 @@
 # Repository:       https://github.com/sickcodes/Docker-OSX
 # Website:          https://sick.codes
 #
-# Status:           Used internally to auto build, run and test images on DO.
+# Status:           Work in progress.
 # 

 help_text="Usage: ./test.sh --branch <string> --repo <string>
@ -33,6 +33,7 @@ Flags

 # set -xeuf -o pipefail

+grep -i Ubuntu /proc/version || { echo "DO NOT RUN THIS ON YOUR WORKSTATION, ONLY RUN THIS ON A THROWAWAY SERVER FOR 1 TIME TESTING" && exit 1 ; }

 # gather arguments
 while (( "$#" )); do
@ -120,17 +121,13 @@ NO_CACHE="${NO_CACHE:=--no-cache}"


 TEST_BUILDS=(
-    'docker-osx:naked'
-    'docker-osx:naked-auto'
-    'docker-osx:auto'
-)
-
-VERSION_BUILDS=(
-    'high-sierra'
-    'mojave'
-    'catalina'
-    'big-sur'
-    'monterey'
+'docker-osx:latest'
+'docker-osx:naked'
+'docker-osx:naked-auto'
+'docker-osx:big-sur'
+'docker-osx:monterey'
+'docker-osx:auto'
+#'docker-osx:auto-big-sur'
 )

 install_docker () {
@ -178,7 +175,7 @@ install_scrotcat () {
    make -C ./imcat
    sudo cp ./imcat/imcat /usr/bin/imcat
    touch /usr/bin/scrotcat
-    tee  /usr/bin/scrotcat <<< '/usr/bin/imcat <(scrot -o /dev/stdout)'
+    tee -a /usr/bin/scrotcat <<< '/usr/bin/imcat <(scrot -o /dev/stdout)'
    chmod +x /usr/bin/scrotcat
 }

@ -200,13 +197,25 @@ enable_kvm () {
    echo 1 | tee /sys/module/kvm/parameters/ignore_msrs
 }

+
 clone_repo () {
    git clone --branch="${1}" "${2}" Docker-OSX
 }

+
+docker-osx:latest () {
+    docker build ${NO_CACHE} \
+        --build-arg BRANCH="${BRANCH}" \
+        --build-arg RANKMIRRORS=true \
+        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
+        -f ./Dockerfile \
+        -t docker-osx:latest .
+    docker tag docker-osx:latest sickcodes/docker-osx:latest
+}
+
+
 docker-osx:naked () {
    docker build ${NO_CACHE} \
-        --squash \
        --build-arg RANKMIRRORS=true \
        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
        -f ./Dockerfile.naked \
@ -214,9 +223,9 @@ docker-osx:naked () {
    docker tag docker-osx:naked sickcodes/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 \
@ -224,6 +233,26 @@ docker-osx:naked-auto () {
    docker tag docker-osx:naked-auto sickcodes/docker-osx:naked-auto
 }

+
+docker-osx:big-sur () {
+    docker build ${NO_CACHE} \
+        --build-arg VERSION=11 \
+        --build-arg RANKMIRRORS=true \
+        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
+        -f ./Dockerfile \
+        -t docker-osx:big-sur .
+    docker tag docker-osx:big-sur sickcodes/docker-osx:big-sur
+}
+
+docker-osx:monterey () {
+    docker build ${NO_CACHE} \
+        --build-arg RANKMIRRORS=true \
+        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
+        -f ./Dockerfile.monterey \
+        -t docker-osx:monterey .
+    docker tag docker-osx:monterey sickcodes/docker-osx:monterey
+}
+
 docker-osx:auto () {
    docker build ${NO_CACHE} \
        --build-arg RANKMIRRORS=true \
@ -233,35 +262,17 @@ docker-osx:auto () {
    docker tag docker-osx:auto sickcodes/docker-osx:auto
 }

-# docker-osx:auto-big-sur () {
-#     docker build ${NO_CACHE} \
-#         --build-arg RANKMIRRORS=true \
-#         --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
-#         --build-arg IMAGE_URL='https://images.sick.codes/mac_hdd_ng_auto_big_sur.img' \
-#         -f ./Dockerfile.auto \
-#         -t docker-osx:auto-big-sur .
-#     docker tag docker-osx:auto-big-sur sickcodes/docker-osx:auto-big-sur
-# }
-
-docker-osx:version () {
-    SHORTNAME="${1}"
+docker-osx:auto-big-sur () {
    docker build ${NO_CACHE} \
-        --build-arg BRANCH="${BRANCH}" \
        --build-arg RANKMIRRORS=true \
-        --build-arg SHORTNAME="${SHORTNAME}" \
        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
-        -f ./Dockerfile \
-        -t "docker-osx:${SHORTNAME}" .
-    docker tag "docker-osx:${SHORTNAME}" "sickcodes/docker-osx:${SHORTNAME}"
+        --build-arg IMAGE_URL='https://images.sick.codes/mac_hdd_ng_auto_big_sur.img' \
+        -f ./Dockerfile.auto \
+        -t docker-osx:auto-big-sur .
+    docker tag docker-osx:auto-big-sur sickcodes/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
@ -270,47 +281,42 @@ EOF
    systemctl enable --now docker
 }

-tee -a ~/.bashrc <<EOF
+tee -a ~/.bashrc <<EOF ; true &&
 export DEBIAN_FRONTEND=noninteractive
 export TZ=UTC
 EOF
-export DEBIAN_FRONTEND=noninteractive
-export TZ=UTC
-ln -snf "/usr/share/zoneinfo/${TZ}" /etc/localtime
-tee -a /etc/timezone <<< "${TZ}"
-apt update -y
-apt-get install keyboard-configuration -y
-docker -v | grep '\ 20\.\|\ 19\.' || install_docker
-yes | apt install -y --no-install-recommends tzdata -y
-install_scrotcat
-yes | install_vnc
-export_display_99
-start_xvfb
-# start_vnc
-enable_kvm
-reset_docker_hard
-echo killall Xvfb
-clone_repo "${BRANCH}" "${REPO}"
-cd ./Docker-OSX
-
-for SHORTNAME in "${VERSION_BUILDS[@]}"; do
-    docker-osx:version "${SHORTNAME}"
-done
-
-docker tag docker-osx:catalina sickcodes/docker-osx:latest
-
-for TEST_BUILD in "${TEST_BUILDS[@]}"; do
+export DEBIAN_FRONTEND=noninteractive \
+; export TZ=UTC \
+; ln -snf "/usr/share/zoneinfo/${TZ}" /etc/localtime \
+; tee -a /etc/timezone <<< "${TZ}" \
+; apt update -y \
+; apt-get install keyboard-configuration -y \
+; docker -v | grep '\ 20\.\|\ 19\.' || install_docker \
+; yes | apt install -y --no-install-recommends tzdata -y \
+; install_scrotcat \
+; yes | install_vnc \
+; export_display_99 \
+; echo start_xvfb \
+; start_vnc \
+; enable_kvm \
+; echo reset_docker_hard \
+; echo killall Xvfb \
+; clone_repo "${BRANCH}" "${REPO}" \
+; cd Docker-OSX \
+; for TEST_BUILD in "${TEST_BUILDS[@]}"; do
    "${TEST_BUILD}"
-done
-
-# boot each image and test
-bash ./tests/boot-images.sh || exit 1
+done \
+&& touch COMPLETED

 if [[ "${DOCKER_USERNAME}" ]] && [[ "${DOCKER_PASSWORD}" ]]; then
    docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_PASSWORD}" \
-        && for SHORTNAME in "${VERSION_BUILDS[@]}"; do
-            docker push "sickcodes/docker-osx:${SHORTNAME}"
-        done \
+        && docker push sickcodes/docker-osx:latest \
+        && docker push sickcodes/docker-osx:big-sur \
+        && docker push sickcodes/docker-osx:monterey \
+        && docker push sickcodes/docker-osx:naked \
+        && docker push sickcodes/docker-osx:naked-auto \
+        && docker push sickcodes/docker-osx:auto \
+        && docker push sickcodes/docker-osx:auto-big-sur \
        && touch PUSHED
 fi