Fixes #368 Downgrade kernel for the subsystem to 5.12, and hold back libguestfs at libguestfs-1.44.1

Typo in README

CHANGELOG.md

@@ -1,5 +1,7 @@
 |Version|Date|Notes|
 |---|---|---|
+|   |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.|
 |5.0|2021-07-25|Retire glibc patch. Retire file command patch. Add bootmenu=on.|
 |   |2021-07-08|Add CPUID_FLAGS to edit the CPUID flags on the fly.|

CREDITS.md

@@ -88,4 +88,10 @@ This project now uses the fantastic OpenCore bootloader from the community OpenC
 
 [@allansrc](https://github.com/allansrc) - Update Doc detail for run on WLS #318 
 
+[@mcandre](https://github.com/mcandre) - fix typo #334 
 
+[@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

Dockerfile

@@ -52,8 +52,7 @@
 #       # you will also need to pass the device to the container
 
 FROM archlinux:base-devel
-
-MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes>
+LABEL maintainer='https://twitter.com/sickcodes <https://sick.codes>'
 
 SHELL ["/bin/bash", "-c"]
 
@@ -167,13 +166,6 @@ RUN [[ "${VERSION%%.*}" -ge 11 ]] && { wget "${FETCH_MAC_OS_RAW}" \
 
 WORKDIR /home/arch/OSX-KVM
 
-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 \
-    ; fi
-
 # optional --build-arg to change branches for testing
 ARG BRANCH=master
 ARG REPO='https://github.com/sickcodes/Docker-OSX.git'
@@ -200,7 +192,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-Catalina/OpenCore.qcow2} \' \
+    && 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=qcow2 \' \
@@ -216,30 +208,83 @@ 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
 
-# 5.13 problem
+#### 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 LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
 
-RUN sudo pacman -Rns linux --noconfirm \
-    ; sudo pacman -Syy \
-    ; sudo pacman -S mkinitcpio --noconfirm \
-    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
+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 libguestfs-test-tool \
         ; sudo rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool
+    ; fi
+
+####
+
+# 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
+
+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}"
+
+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}"
+
+### 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=
@@ -309,16 +354,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-Catalina/OpenCore.qcow2
+# the default serial numbers are already contained in ./OpenCore/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-Catalina/OpenCore-nopicker.qcow2}" \
+        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
     ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
     ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
         ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
             --master-plist-url="${MASTER_PLIST_URL}" \
@@ -327,7 +372,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-Catalina/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
             --output-env "${ENV:=/env}" \
     || exit 1 ; } \
     ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@@ -341,7 +386,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-Catalina/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
     || exit 1 ; } \
     ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
 

Dockerfile.auto

@@ -92,19 +92,29 @@ USER arch
 
 ENV USER arch
 
-# 5.13 problem
+
+#### 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 LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
 
-RUN sudo pacman -Rns linux --noconfirm \
-    ; sudo pacman -Syy \
-    ; sudo pacman -S mkinitcpio --noconfirm \
-    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
+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 libguestfs-test-tool \
         ; sudo rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool
+    ; fi
+
+####
+
 
 WORKDIR /home/arch/OSX-KVM
 
@@ -135,6 +145,14 @@ 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=
@@ -200,9 +218,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-Catalina/OpenCore-nopicker.qcow2}" \
+        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
     ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
     ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
         ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
             --master-plist-url="${MASTER_PLIST_URL}" \
@@ -211,7 +229,7 @@ CMD echo "${BOILERPLATE}" \
             --bootdisks \
             --width "${WIDTH:-1920}" \
             --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
             --output-env "${ENV:=/env}" \
     || exit 1 ; } \
     ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@@ -225,7 +243,7 @@ CMD echo "${BOILERPLATE}" \
             --mac-address "${MAC_ADDRESS}" \
             --width "${WIDTH:-1920}" \
             --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}"  \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}"  \
     || exit 1 ; } \
     ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
         nohup Xvfb :99 -screen 0 1920x1080x16 \
@@ -240,7 +258,7 @@ CMD echo "${BOILERPLATE}" \
     ; } \
     ; /bin/bash -c ./Launch.sh \
     & echo "Booting Docker-OSX in the background. Please wait..." \
-    ; until [[ "$(sshpass -p${MAC_PASSWORD} ssh-copy-id -f -i ~/.ssh/id_docker_osx.pub -p 10022 ${USERNAME}@127.0.0.1)" ]]; do \
+    ; until [[ "$(sshpass -p${PASSWORD:=alpine} ssh-copy-id -f -i ~/.ssh/id_docker_osx.pub -p 10022 ${USERNAME:=user}@127.0.0.1)" ]]; do \
         echo "Disk is being copied between layers. Repeating until able to copy SSH key into OSX..." \
         ; sleep 1 \
     ; done \

Dockerfile.monterey

@@ -0,0 +1,237 @@
+#!/usr/bin/docker
+#     ____             __             ____  ______  __
+#    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
+#   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   /
+#  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |
+# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_| [MONTEREY]
+#
+# 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
+# 
+# Notes:            Uses a self-hosted BaseSystem.img from a USB installer.
+#                   If you want to DIY, use https://github.com/corpnewt/gibMacOS
+#                   Set seed as developer, and install the Install Assistant on Big Sur
+#                   Burn to a USB, and pull out BaseSystem.img
+#                   Or download from https://images.sick.codes/BaseSystem_Monterey.dmg
+# 
+
+FROM sickcodes/docker-osx
+
+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 BASE_SYSTEM='https://images.sick.codes/BaseSystem_Monterey.dmg'
+
+WORKDIR /home/arch/OSX-KVM
+
+RUN wget -O BaseSystem.dmg "${BASE_SYSTEM}" \
+    && qemu-img convert BaseSystem.dmg -O qcow2 -p -c BaseSystem.img \
+    && rm -f BaseSystem.dmg
+
+RUN qemu-img create -f qcow2 /home/arch/OSX-KVM/mac_hdd_ng.img "${SIZE}"
+
+WORKDIR /home/arch/OSX-KVM
+
+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 \
+    ; 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 rm -rf ./Docker-OSX \
+    && 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=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 <<< '-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
+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
+
+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 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 libguestfs-test-tool \
+        ; sudo rm -rf /var/tmp/.guestfs-* \
+    ; 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 -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-custom.plist"
+
+# ENV NETWORKING=e1000-82545em
+ENV NETWORKING=vmxnet3
+
+# 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"]
+
+# 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
+
+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/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/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/OpenCore.qcow2}" \
+    || exit 1 ; } \
+    ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
+
+# virt-manager mode: eta son
+# CMD virsh define <(envsubst < Docker-OSX.xml) && virt-manager || virt-manager
+# CMD virsh define <(envsubst < macOS-libvirt-Catalina.xml) && virt-manager || virt-manager

Dockerfile.naked

@@ -54,7 +54,8 @@ RUN if [[ "${RANKMIRRORS}" ]]; then { pacman -Sy wget --noconfirm || pacman -Syu
         && tee -a /etc/pacman.d/mirrorlist <<< 'Server = http://mirrors.evowise.com/archlinux/$repo/os/$arch' \
         && tee -a /etc/pacman.d/mirrorlist <<< 'Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch' \
         && tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \
-    && cat /etc/pacman.d/mirrorlist ; fi
+        && cat /etc/pacman.d/mirrorlist \
+    ; fi
 
 # For taking screenshots of the Xfvb screen, useful during development.
 ARG SCROT
@@ -80,19 +81,29 @@ USER arch
 
 ENV USER arch
 
-# 5.13 problem
+
+#### 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 LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
 
-RUN sudo pacman -Rns linux --noconfirm \
-    ; sudo pacman -Syy \
-    ; sudo pacman -S mkinitcpio --noconfirm \
-    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
+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 libguestfs-test-tool \
         ; sudo rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool
+    ; fi
+
+####
+
 
 WORKDIR /home/arch/OSX-KVM
 
@@ -106,6 +117,13 @@ RUN mkdir -p ~/.ssh \
     && tee -a ~/.ssh/config <<< '    StrictHostKeyChecking no' \
     && tee -a ~/.ssh/config <<< '    UserKnownHostsFile=/dev/null'
 
+####
+
+# 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=
@@ -164,9 +182,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-Catalina/OpenCore-nopicker.qcow2}" \
+        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
     ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
     ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
         ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
             --master-plist-url="${MASTER_PLIST_URL}" \
@@ -175,7 +193,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-Catalina/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
             --output-env "${ENV:=/env}" \
     || exit 1 ; } \
     ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@@ -189,6 +207,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-Catalina/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
     || exit 1 ; } \
     ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh

Dockerfile.naked-auto

@@ -73,19 +73,28 @@ USER arch
 
 ENV USER arch
 
-# 5.13 problem
+#### 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 LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
 
-RUN sudo pacman -Rns linux --noconfirm \
-    ; sudo pacman -Syy \
-    ; sudo pacman -S mkinitcpio --noconfirm \
-    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
+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 libguestfs-test-tool \
         ; sudo rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool
+    ; fi
+
+####
+
 
 WORKDIR /home/arch/OSX-KVM
 
@@ -116,6 +125,13 @@ 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=
@@ -152,6 +168,10 @@ ENV NETWORKING=vmxnet3
 
 ENV NOPICKER=true
 
+# set the username and password for automatically logging in
+ENV USERNAME=user
+ENV PASSWORD=alpine
+
 # dynamic RAM options for runtime
 ENV RAM=3
 # ENV RAM=max
@@ -175,15 +195,11 @@ CMD echo "${BOILERPLATE}" \
     ; echo "Disk is being copied between layers... Please wait a minute..." \
     ; 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 \
-    ; { [[ "${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="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
+        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
     ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
     ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
         ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
             --master-plist-url="${MASTER_PLIST_URL}" \
@@ -192,7 +208,7 @@ CMD echo "${BOILERPLATE}" \
             --bootdisks \
             --width "${WIDTH:-1920}" \
             --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
             --output-env "${ENV:=/env}" \
     || exit 1 ; } \
     ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@@ -206,8 +222,12 @@ CMD echo "${BOILERPLATE}" \
             --mac-address "${MAC_ADDRESS}" \
             --width "${WIDTH:-1920}" \
             --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
     || exit 1 ; } \
+    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
+        nohup Xvfb :99 -screen 0 1920x1080x16 \
+        & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
+    ; } \
     ; stat "${IMAGE_PATH}" \
     ; echo "Large image is being copied between layers, please wait a minute..." \
     ; ./enable-ssh.sh \
@@ -217,7 +237,7 @@ CMD echo "${BOILERPLATE}" \
     ; } \
     ; /bin/bash -c ./Launch.sh \
     & echo "Booting Docker-OSX in the background. Please wait..." \
-    ; until [[ "$(sshpass -p${MAC_PASSWORD:=alpine} ssh-copy-id -f -i ~/.ssh/id_docker_osx.pub -p 10022 ${USERNAME:=user}@127.0.0.1)" ]]; do \
+    ; until [[ "$(sshpass -p${PASSWORD:=alpine} ssh-copy-id -f -i ~/.ssh/id_docker_osx.pub -p 10022 ${USERNAME:=user}@127.0.0.1)" ]]; do \
         echo "Disk is being copied between layers. Repeating until able to copy SSH key into OSX..." \
         ; sleep 1 \
     ; done \

README.md

@@ -2,10 +2,26 @@
 
 ![Running Mac OS X in a Docker container](/running-mac-inside-docker-qemu.png?raw=true "OSX KVM DOCKER")
 
-Run Mac OS X in Docker with near-native performance! X11 Forwarding! iMessage security research!
+Run Mac OS X in Docker with near-native performance! X11 Forwarding! iMessage security research! iPhone USB working! macOS in a Docker container!
 
-# Docker-OSX now has a Discord server:
-# [https://discord.gg/mx8pPw39Yg](https://discord.gg/mx8pPw39Yg)
+# Docker-OSX now has a Discord server & Telegram!
+
+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/mx8pPw39Yg"><a href="https://discord.gg/mx8pPw39Yg" target="_blank"><img src="https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/discord-logo.svg"></a></a>
+</p>
+
+
+
+
+### 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)
+
+Or reach out via Linkedin if it's private: [https://www.linkedin.com/in/sickcodes](https://www.linkedin.com/in/sickcodes)
+
+Or via [https://sick.codes/contact/](https://sick.codes/contact/)
 
 ## Author
 
@@ -23,10 +39,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?
@@ -41,6 +61,8 @@ docker run -it \
     -v /tmp/.X11-unix:/tmp/.X11-unix \
     -e "DISPLAY=${DISPLAY:-:0.0}" \
     sickcodes/docker-osx:latest
+
+# docker build -t docker-osx .
 ```
 ### Big Sur [![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)
 
@@ -51,6 +73,24 @@ docker run -it \
     -v /tmp/.X11-unix:/tmp/.X11-unix \
     -e "DISPLAY=${DISPLAY:-:0.0}" \
     sickcodes/docker-osx: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)
+
+```bash
+
+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 MASTER_PLIST_URL='https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist' \
+    sickcodes/docker-osx: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)
@@ -87,6 +127,8 @@ docker run -it \
     -v "${PWD}/mac_hdd_ng_auto.img:/image" \
     -v /tmp/.X11-unix:/tmp/.X11-unix \
     -e "DISPLAY=${DISPLAY:-:0.0}" \
+    -e GENERATE_UNIQUE=true \
+    -e MASTER_PLIST_URL=https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/custom/config-nopicker-custom.plist \
     sickcodes/docker-osx:naked
 ```
 
@@ -96,7 +138,9 @@ docker run -it \
 [![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)
 
 
-Enable SSH in network sharing inside the guest first. Change `-e "USERNAME=user"` and `-e "USERNAME=password"` to your credentials. The container will add itself to `~/.ssh/authorized_keys`
+Enable SSH in network sharing inside the guest first. Change `-e "USERNAME=user"` and `-e "PASSWORD=password"` to your credentials. The container will add itself to `~/.ssh/authorized_keys`
+
+Since you can't see the screen, use the PLIST with nopicker, for example:
 
 ```bash
 wget https://images2.sick.codes/mac_hdd_ng_auto.img
@@ -108,22 +152,117 @@ docker run -it \
     -v /tmp/.X11-unix:/tmp/.X11-unix \
     -e "DISPLAY=${DISPLAY:-:0.0}" \
     -e "USERNAME=user" \
-    -e "DISPLAY=alpine" \
+    -e "PASSWORD=alpine" \
+    -e GENERATE_UNIQUE=true \
+    -e MASTER_PLIST_URL=https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/custom/config-nopicker-custom.plist \
     sickcodes/docker-osx:naked-auto
 ```
 
-## Make container FASTER
+# (VFIO) iPhone USB passthrough (VFIO)
+
+If you have a laptop see the next usbfluxd section.
+
+If you have a desktop PC, you can use [@Silfalion](https://github.com/Silfalion)'s instructions : [https://github.com/Silfalion/Iphone_docker_osx_passthrough](https://github.com/Silfalion/Iphone_docker_osx_passthrough)
+
+# (USBFLUXD) iPhone USB -> Network style passthrough OSX-KVM Docker-OSX
+
+This method WORKS on laptop, PC, anything!
+
+Thank you [@nikias](https://github.com/nikias) for [usbfluxd](https://github.com/corellium/usbfluxd) via [https://github.com/corellium](https://github.com/corellium)!
+
+**This is done inside Linux.**
+
+Open 3 terminals on Linux
+
+Connecting your device over USB on Linux allows you to expose `usbmuxd` on port `5000` using [https://github.com/corellium/usbfluxd](https://github.com/corellium/usbfluxd) to another system on the same network.
+
+Ensure `usbmuxd`, `socat` and `usbfluxd` are installed.
+
+`sudo pacman -S libusbmuxd usbmuxd avahi socat`
+
+Available on the AUR: [https://aur.archlinux.org/packages/usbfluxd/](https://aur.archlinux.org/packages/usbfluxd/)
+
+`yay usbfluxd`
+
+Plug in your iPhone or iPad.
+
+Terminal 1
+```bash
+sudo systemctl start usbmuxd
+sudo avahi-daemon
+```
+
+Terminal 2:
+```bash
+# on host
+sudo systemctl restart usbmuxd
+sudo socat tcp-listen:5000,fork unix-connect:/var/run/usbmuxd
+```
+
+Terminal 3:
+```bash
+sudo usbfluxd -f -n
+```
+
+### Connect to a host running usbfluxd
+
+**This is done inside macOS.**
+
+Install homebrew.
+
+`172.17.0.1` is usually the Docker bridge IP, which is your PC, but you can use any IP from `ip addr`...
+
+macOS Terminal:
+```zsh
+# on the guest
+brew install make automake autoconf libtool pkg-config gcc libimobiledevice usbmuxd
+
+git clone https://github.com/corellium/usbfluxd.git
+cd usbfluxd
+
+./autogen.sh
+make
+sudo make install
+```
+
+Accept the USB over TCP connection, and appear as local:
+
+```bash
+# on the guest
+sudo launchctl start usbmuxd
+export PATH=/usr/local/sbin:${PATH}
+sudo usbfluxd -f -r 172.17.0.1:5000
+```
+
+Close apps such as Xcode and reopen them and your device should appear!
+
+*If you need to start again on Linux, wipe the current usbfluxd, usbmuxd, and socat:*
+```bash
+sudo killall usbfluxd
+sudo systemctl restart usbmuxd
+sudo killall socat
+```
+
+## Make container FASTER using [https://github.com/sickcodes/osx-optimizer](https://github.com/sickcodes/osx-optimizer)
 
 SEE commands in [https://github.com/sickcodes/osx-optimizer](https://github.com/sickcodes/osx-optimizer)!
 
 - Skip the GUI login screen (at your own risk!)
-- Disable spotlight indexing on macOS to heavily speed up Virual Instances.
+- Disable spotlight indexing on macOS to heavily speed up Virtual Instances.
 - Disable heavy login screen wallpaper
 - Disable updates (at your own risk!)
 
 ## Important notices:
 
-**2021-07-27:**  Bug in libguestfs currently preventing `GENERATE_UNIQUE` and `GENERATE_TRUE`
+**2021-09-09** - Bootdisks at runtime required for Monterey!
+
+Pick one of these:
+```
+    -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
 
@@ -143,6 +282,10 @@ 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)
 
+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 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)
@@ -156,6 +299,9 @@ Same as above but with `-e USERNAME` & `-e PASSWORD` and `-e OSX_COMMANDS="put y
 [![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!
+- macOS Monterey!
+- Folder sharing
 - SSH enabled (`localhost:50922`)
 - VNC enabled (`localhost:8888`) if using ./vnc version
 - [serial number generator!](https://github.com/sickcodes/osx-serial-generator)
@@ -223,7 +369,8 @@ Docker-OSX is licensed under the [GPL v3+](LICENSE). Contributions are welcomed
 
 ### Other cool Docker/QEMU based projects
 - [Run Android in a Docker Container with Dock Droid](https://github.com/sickcodes/dock-droid)
-- [Run iOS in a Docker container with Docker-eyeOS](https://github.com/sickcodes/Docker-eyeOS) - [https://github.com/sickcodes/Docker-eyeOS](https://github.com/sickcodes/Docker-eyeOS)
+- [Run Android fully native on the host!](https://github.com/sickcodes/droid-native)
+- [Run iOS 12 in a Docker container with Docker-eyeOS](https://github.com/sickcodes/Docker-eyeOS) - [https://github.com/sickcodes/Docker-eyeOS](https://github.com/sickcodes/Docker-eyeOS)
 - [Run iMessage relayer in Docker with Bluebubbles.app](https://bluebubbles.app/) - [Getting started wiki](https://github.com/BlueBubblesApp/BlueBubbles-Server/wiki/Running-via-Docker)
 
 ## Disclaimer
@@ -249,6 +396,7 @@ Create your personal image using `:latest` or `big-sur`. Then, pull the image ou
 - `sickcodes/docker-osx:auto` - [I'm only interested in using the command line (useful for compiling software or using Homebrew headlessly).](#prebuilt-image-with-arbitrary-command-line-arguments)
 - `sickcodes/docker-osx:naked` - [I need iMessage/iCloud for security research.](#generating-serial-numbers)
 - `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)
 
 ## 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.
@@ -304,6 +452,42 @@ More specific/advanced troubleshooting questions and answers may be found in [Mo
 
 See [initial setup](#initial-setup).
 
+
+
+#### Docker Unknown Server OS error
+
+```console
+docker: unknown server OS: .
+See 'docker run --help'.
+```
+
+This means your docker daemon is not running.
+
+`pgrep dockerd` should return nothing
+
+Therefore, you have a few choices.
+
+`sudo dockerd` for foreground Docker usage. I use this.
+
+Or
+
+`sudo systemctl --start dockerd` to start dockerd this now.
+
+Or
+
+`sudo systemctl --enable --now dockerd` for start dockerd on every reboot, and now.
+
+
+#### Use more CPU Cores/SMP
+
+This will use all available cores; adjust accordingly to the day of the week:
+
+```
+    -e CPU_STRING=$(nproc) \
+```
+
+This will use `-smp $(nproc)`
+
 #### 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.
@@ -343,51 +527,6 @@ Big thank you to our contributors who have worked out almost every conceivable i
 
 [https://github.com/sickcodes/Docker-OSX/blob/master/CREDITS.md](https://github.com/sickcodes/Docker-OSX/blob/master/CREDITS.md)
 
-### The big-sur image starts slowly after installation. Is this expected?
-
-Automatic updates are still on in the container's settings. You may wish to turn them off. [We have future plans for development around this.](https://github.com/sickcodes/Docker-OSX/issues/227)
-
-### What is `${DISPLAY:-:0.0}`?
-
-`$DISPLAY` is the shell variable that refers to your X11 display server.
-
-`${DISPLAY}` is the same, but allows you to join variables like this:
-
-- e.g. `${DISPLAY}_${DISPLAY}` would print `:0.0_:0.0`
-- e.g. `$DISPLAY_$DISPLAY`     would print `:0.0`
-
-...because `$DISPLAY_` is not `$DISPLAY`
-
-`${variable:-fallback}` allows you to set a "fallback" variable to be substituted if `$variable` is not set.
-
-You can also use `${variable:=fallback}` to set that variable (in your current terminal).
-
-In Docker-OSX, we assume, `:0.0` is your default `$DISPLAY` variable.
-
-You can see what yours is
-
-```bash
-echo $DISPLAY
-```
-
-That way, `${DISPLAY:-:0.0}` will use whatever variable your X11 server has set for you, else `:0.0`
-
-### What is `-v /tmp/.X11-unix:/tmp/.X11-unix`?
-
-`-v` is a Docker command-line option that lets you pass a volume to the container.
-
-The directory that we are letting the Docker container use is a X server display socket.
-
-`/tmp/.X11-unix`
-
-If we let the Docker container use the same display socket as our own environment, then any applications you run inside the Docker container will show up on your screen too! [https://www.x.org/archive/X11R6.8.0/doc/RELNOTES5.html](https://www.x.org/archive/X11R6.8.0/doc/RELNOTES5.html)
-
-### ALSA errors on startup or container creation
-
-You may when initialising or booting into a container see errors from the `(qemu)` console of the following form: 
-`ALSA lib blahblahblah: (function name) returned error: no such file or directory`. These are more or less expected. As long as you are able to boot into the container and everything is working, no reason to worry about these.
-
-See also: [here](https://github.com/sickcodes/Docker-OSX/issues/174).
 
 ### Start the same container later (persistent disk)
 
@@ -429,7 +568,7 @@ docker ps -a
 docker start -ai -i <Replace this with your ID>
 ```
 
-### LibGTK errors
+### LibGTK errors "connection refused"
 
 You may see one or more libgtk-related errors if you do not have everything set up for hardware virtualisation yet. If you have not yet done so, check out the [initial setup](#initial-setup) section and the [routine checks](#routine-checks) section as you may have missed a setup step or may not have all the needed Docker dependencies ready to go.
 
@@ -585,6 +724,77 @@ nano /etc/sysctl.conf || vi /etc/sysctl.conf || vim /etc/sysctl.conf
 # now reboot
 ```
 
+## Share folder with Docker-OSX QEMU macOS
+
+Sharing a folder with guest is quite simple.
+
+Your folder, will go to /mnt/hostshare inside the Arch container which is then passed over QEMU.
+
+Then mount using `sudo -S mount_9p hostshare` from inside the mac.
+
+For example,
+
+```bash
+FOLDER=~/somefolder
+```
+
+```bash
+    -v "${FOLDER}:/mnt/hostshare" \
+    -e EXTRA="-virtfs local,path=/mnt/hostshare,mount_tag=hostshare,security_model=passthrough,id=hostshare" \
+```
+
+Full example:
+
+```bash
+# stat mac_hdd_ng.img
+SHARE=~/somefolder
+
+docker run -it \
+    --device /dev/kvm \
+    -p 50922:10022 \
+    -v /tmp/.X11-unix:/tmp/.X11-unix \
+    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    -v "${PWD}/mac_hdd_ng.img:/home/arch/OSX-KVM/mac_hdd_ng.img" \
+    -v "${SHARE}:/mnt/hostshare" \
+    -e EXTRA="-virtfs local,path=/mnt/hostshare,mount_tag=hostshare,security_model=passthrough,id=hostshare" \
+    sickcodes/docker-osx:latest
+
+# !!! Open Terminal inside macOS and run the following command to mount the virtual file system
+# sudo -S mount_9p hostshare
+
+```
+
+
+### Share USB Drive into macOS over QEMU
+
+## Mount USB Drive (Hotplug/Hot Plug USB)
+
+Start your container.
+
+Pick a port, for example, `7700`.
+
+`lsusb` to get `vid:pid`
+
+On Linux:
+`sudo usbredirserver -p 7700 1e3d:2096`
+
+Now, in the Docker window hit Enter to see the `(qemu)` console.
+
+You can add/remove the disk using commands like this, even once the machine is started:
+
+`chardev-add socket,id=usbredirchardev1,port=7700,host=172.17.0.1`
+
+`device_add usb-redir,chardev=usbredirchardev1,id=usbredirdev1,debug=4`
+
+## Mount USB Drive inside macOS at boot Docker OSX
+
+```bash
+PORT=7700
+IP_ADDRESS=172.17.0.1
+
+-e EXTRA="-chardev socket,id=usbredirchardev1,port=${PORT},host=${IP_ADDRESS} -device usb-redir,chardev=usbredirchardev1,id=usbredirdev1,debug=4" \`
+```
+
 ### Fedora: enable internet connectivity with a bridged network
 
 Fedora's default firewall settings may prevent Docker's network interface from reaching the internet. In order to reoslve this, you will need to whitelist the interface in your firewall:
@@ -710,7 +920,10 @@ At any time, verify your serial number before logging into iCloud, etc.
 # this is a quick way to check your serial number via cli inside OSX
 ioreg -l | grep IOPlatformSerialNumber
 
-# or from the host
+# test some commands
+sshpass -p 'alpine' ssh user@localhost -p 50922 'ping google.com'
+
+# check your serial number
 sshpass -p 'alpine' ssh user@localhost -p 50922 'ioreg -l | grep IOPlatformSerialNumber'
 ```
 
@@ -774,8 +987,9 @@ docker run --rm -it \
     -e NOPICKER=true \
     -e GENERATE_UNIQUE=true \
     -e DEVICE_MODEL="iMacPro1,1" \
-    -e OSX_COMMANDS='ioreg -l | grep IOPlatformSerialNumber' \
     sickcodes/docker-osx:auto
+
+# -e OSX_COMMANDS='ioreg -l | grep IOPlatformSerialNumber' \
 ```
 
 #### This example generates a specific set of serial numbers at runtime
@@ -880,7 +1094,9 @@ 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 with WSL2 (Windows, Ubuntu)
+### I'd like to run Docker-OSX on Windows
+
+Running Docker-OSX on windows is possible just in WSL2 (Windows, Ubuntu).
 
 Ensure KVM is enabled and `x11-apps` is installed.
 
@@ -1196,9 +1412,6 @@ 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
@@ -1211,7 +1424,7 @@ docker run -it \
     -v /tmp/.X11-unix:/tmp/.X11-unix \
     -e "DISPLAY=${DISPLAY:-:0.0}" \
     -e USERNAME=yourusername \
-    -e USERNAME=yourpassword \
+    -e PASSWORD=yourpassword \
     -e "OSX_COMMANDS=/bin/bash -c \"put your commands here\"" \
     sickcodes/docker-osx:naked-auto
 
@@ -1307,6 +1520,7 @@ Note: `-disable-ticketing` will allow unauthenticated access to the VM. See the
 ```bash
   docker run \
     --device /dev/kvm \
+    -p 3001:3001 \
     -p 50922:10022 \
     -e "DISPLAY=${DISPLAY:-:0.0}" \
     -e EXTRA="-monitor telnet::45454,server,nowait -nographic -serial null -spice disable-ticketing,port=3001" \
@@ -1403,3 +1617,52 @@ chmod +x ./Launch-nopicker.sh
 sed -i -e s/OpenCore\.qcow2/OpenCore\-nopicker\.qcow2/ ./Launch-nopicker.sh
 "
 ```
+
+
+
+### The big-sur image starts slowly after installation. Is this expected?
+
+Automatic updates are still on in the container's settings. You may wish to turn them off. [We have future plans for development around this.](https://github.com/sickcodes/Docker-OSX/issues/227)
+
+### What is `${DISPLAY:-:0.0}`?
+
+`$DISPLAY` is the shell variable that refers to your X11 display server.
+
+`${DISPLAY}` is the same, but allows you to join variables like this:
+
+- e.g. `${DISPLAY}_${DISPLAY}` would print `:0.0_:0.0`
+- e.g. `$DISPLAY_$DISPLAY`     would print `:0.0`
+
+...because `$DISPLAY_` is not `$DISPLAY`
+
+`${variable:-fallback}` allows you to set a "fallback" variable to be substituted if `$variable` is not set.
+
+You can also use `${variable:=fallback}` to set that variable (in your current terminal).
+
+In Docker-OSX, we assume, `:0.0` is your default `$DISPLAY` variable.
+
+You can see what yours is
+
+```bash
+echo $DISPLAY
+```
+
+That way, `${DISPLAY:-:0.0}` will use whatever variable your X11 server has set for you, else `:0.0`
+
+### What is `-v /tmp/.X11-unix:/tmp/.X11-unix`?
+
+`-v` is a Docker command-line option that lets you pass a volume to the container.
+
+The directory that we are letting the Docker container use is a X server display socket.
+
+`/tmp/.X11-unix`
+
+If we let the Docker container use the same display socket as our own environment, then any applications you run inside the Docker container will show up on your screen too! [https://www.x.org/archive/X11R6.8.0/doc/RELNOTES5.html](https://www.x.org/archive/X11R6.8.0/doc/RELNOTES5.html)
+
+### ALSA errors on startup or container creation
+
+You may when initialising or booting into a container see errors from the `(qemu)` console of the following form: 
+`ALSA lib blahblahblah: (function name) returned error: no such file or directory`. These are more or less expected. As long as you are able to boot into the container and everything is working, no reason to worry about these.
+
+See also: [here](https://github.com/sickcodes/Docker-OSX/issues/174).
+

discord-logo.svg

@@ -0,0 +1,14 @@
+<!-- animated SVG is from https://github.com/NNTin/discord-logo -->
+<svg width="90" height="90" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" class="discord-logo-container" viewBox="0 0 48 48">
+    <defs>
+        <g>
+            <path id="discord-logo" d="m40,12c0,0 -4.585,-3.588 -10,-4l-0.488,0.976c4.896,1.198 7.142,2.915 9.488,5.024c-4.045,-2.065 -8.039,-4 -15,-4s-10.955,1.935 -15,4c2.346,-2.109 5.018,-4.015 9.488,-5.024l-0.488,-0.976c-5.681,0.537 -10,4 -10,4s-5.121,7.425 -6,22c5.162,5.953 13,6 13,6l1.639,-2.185c-2.782,-0.967 -5.924,-2.694 -8.639,-5.815c3.238,2.45 8.125,5 16,5s12.762,-2.55 16,-5c-2.715,3.121 -5.857,4.848 -8.639,5.815l1.639,2.185c0,0 7.838,-0.047 13,-6c-0.879,-14.575 -6,-22 -6,-22zm-22.5,18c-1.933,0 -3.5,-1.791 -3.5,-4c0,-2.209 1.567,-4 3.5,-4s3.5,1.791 3.5,4c0,2.209 -1.567,4 -3.5,4zm13,0c-1.933,0 -3.5,-1.791 -3.5,-4c0,-2.209 1.567,-4 3.5,-4s3.5,1.791 3.5,4c0,2.209 -1.567,4 -3.5,4z" />
+        </g>
+    </defs>
+    <g class="discord-logo">
+        <use class="discord-original" href="#discord-logo">
+        </use>
+        <animateTransform attributeName="transform" type="rotate" values="0 24 24;-18 24 24;16.8 24 24;-11.4 24 24;8.7 24 24;-7.5 24 24;6 24 24;-4.8 24 24;3.79 24 24;-3.12 24 24;2.52 24 24;-2.01 24 24;1.56 24 24;-1.2 24 24;0.96 24 24;-0.75 24 24;0.6 24 24;-0.48 24 24;0.384 24 24;0 24 24;0 24 24;0 24 24;0 24 24;0 24 24;0 24 24" begin="0s" dur="2s" fill="freeze" repeatCount="indefinite" />
+    </g>
+    <animate fill="freeze" dur="0000ms" begin="0s" values="#17f018;#000000;#17f018;#000000;#17f018;#000000;#17f018;#000000;#17f018" calMode="linear" attributeName="fill" repeatCount="indefinite" />
+</svg>

tests/test.sh

@@ -124,6 +124,7 @@ TEST_BUILDS=(
 'docker-osx:naked'
 'docker-osx:naked-auto'
 'docker-osx:big-sur'
+'docker-osx:monterey'
 'docker-osx:auto'
 #'docker-osx:auto-big-sur'
 )
@@ -214,6 +215,7 @@ docker-osx:latest () {
 
 docker-osx:naked () {
     docker build ${NO_CACHE} \
+        --squash \
         --build-arg RANKMIRRORS=true \
         --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
         -f ./Dockerfile.naked \
@@ -224,6 +226,7 @@ docker-osx:naked () {
 
 docker-osx:naked-auto () {
     docker build ${NO_CACHE} \
+        --squash \
         --build-arg RANKMIRRORS=true \
         --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
         -f ./Dockerfile.naked-auto \
@@ -242,6 +245,15 @@ 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 \
@@ -262,6 +274,12 @@ docker-osx:auto-big-sur () {
 }
 
 reset_docker_hard () {
+
+    tee /etc/docker/daemon.json <<'EOF'
+{
+    "experimental": true
+}
+EOF
     systemctl disable --now docker
     systemctl disable --now docker.socket
     systemctl stop docker
@@ -288,7 +306,7 @@ export DEBIAN_FRONTEND=noninteractive \
 ; echo start_xvfb \
 ; start_vnc \
 ; enable_kvm \
-; echo reset_docker_hard \
+; reset_docker_hard \
 ; echo killall Xvfb \
 ; clone_repo "${BRANCH}" "${REPO}" \
 ; cd Docker-OSX \
@@ -301,6 +319,7 @@ if [[ "${DOCKER_USERNAME}" ]] && [[ "${DOCKER_PASSWORD}" ]]; then
     docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_PASSWORD}" \
         && 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 \