Merge branch 'master' into glibc-revert-wip

Revert glibc patch when applicable.
2025-07-02 18:53:31 -05:00 · 2021-05-02 23:45:04 +00:00 · 2021-03-01 11:32:23 +00:00
14 changed files with 179 additions and 1256 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,14 +1,5 @@
 |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.|
-|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.|
-|4.4|2021-05-06|Prepare nakedvnc for hub.docker.com. Add `ENV BOOT_ARGS=` to supply additon boot arguments, for example, `vmx,rdtscp`. Add `ENV CPU=Penryn` to allow changes to the CPU emulation, for example, `Skylake-Client`, or see [more examples here](https://manpages.ubuntu.com/manpages/disco/man7/qemu-cpu-models.7.html).| 
-|   |2021-05-04|Disable arbitrary chown warning| 
-|   |2021-04-27|Fixed missing sudo| 
 |   |2021-04-18|Add LIBGUESTFS debug & trace commands, exit on fail when creating bootdisks. Silence touch errors.| 
 |4.3|2021-03-24|Enable interactive QEMU again. Remove envsubst since we are already using bash... Add set -x flag| 
 |4.2|2021-03-24|Add all ENV variables to each dockerfile for readability. Add RAM allocation buffer and cache drop bug fix. Add kvm and libvirt groups. Add `IMAGE_FORMAT=qcow2` to allow `IMAGE_FORMAT=raw` too.|
--- a/CREDITS.md
+++ b/CREDITS.md
@ -22,7 +22,7 @@ This project now uses the fantastic OpenCore bootloader from the community OpenC

 [@qcasey](https://github.com/qcasey) - Removed unnecessary yay in Remove yay dependancy #40 

-[@tlierdotfr](https://github.com/tlierdotfr) - Reduce number of layers in Dockerfile 
+[@tlierdotfr](https://github.com/tlierdotfr) - Reduce number of layers in Dockerfile  

 [@Julioevm](https://github.com/Julioevm) - Update docker-compose.yml #57

@ -46,7 +46,7 @@ This project now uses the fantastic OpenCore bootloader from the community OpenC

 [@PeterDaveHello](https://github.com/PeterDaveHello) - Reduce image size by setting git clone depth #110

-[@PeterDaveHello](https://github.com/PeterDaveHello) - Reduce Dockerfile instructions and Docker image layers #112
+[@PeterDaveHello](https://github.com/PeterDaveHello) -  Reduce Dockerfile instructions and Docker image layers #112

 [@weskerfoot](https://github.com/weskerfoot) Docs updates: usb passthrough, headless mode, disk space reduction guide #113

@ -68,7 +68,7 @@ This project now uses the fantastic OpenCore bootloader from the community OpenC

 [@TheHackerCoding](https://github.com/TheHackerCoding) - Typo in README.md #194

-[@panos](https://github.com/panos) - Improved README #212 
+[@panos](https://github.com/panos) -  Improved README #212 

 [@ggjulio](https://github.com/ggjulio) - Restarting an "auto" container #216

@ -79,17 +79,3 @@ This project now uses the fantastic OpenCore bootloader from the community OpenC
 [@a10kiloham](https://github.com/a10kiloham) - Adding Bluebubbles as an example use case #250 

 [@aronzvi](https://github.com/aronzvi) - Fixed Failed to boot OSX with GENERATE_UNIQUE #244
-
-[@tinjaw](https://github.com/tinjaw) - Fixed Type #258
-
-[@m-zheng](https://github.com/m-zheng) -  Update README.md #260 
-
-[@johnjhacking](https://github.com/johnjhacking) - Change call function to Popen #288 
-
-[@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)
--- a/53
+++ b/53
@ -7,7 +7,7 @@
 #
 # Title:            Docker-OSX (Mac on Docker)
 # Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          6.0
+# Version:          4.3
 # License:          GPLv3+
 # Repository:       https://github.com/sickcodes/Docker-OSX
 # Website:          https://sick.codes
@ -114,7 +114,6 @@ RUN tee -a sshd_config <<< 'AllowTcpForwarding yes' \
 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

 # enable ssh
@ -143,6 +142,9 @@ RUN touch enable-ssh.sh \
 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

+# RUN sudo systemctl enable libvirtd.service
+# RUN sudo systemctl enable virtlogd.service
+
 WORKDIR /home/arch/OSX-KVM

 RUN wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/fetch-macOS.py
@ -174,10 +176,16 @@ RUN if [[ "${LINUX}" == true ]]; then \
        sudo pacman -Syu linux libguestfs --noconfirm \
    ; fi

+# TEMP-FIX for file 5.40 libguestfs issue
+RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
+    && patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
+# TEMP-FIX for file 5.40 libguestfs issue
+
 # 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 \
@ -190,12 +198,12 @@ RUN touch Launch.sh \
    && 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 <<< '-cpu Penryn,vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+pcid,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check \' \
    && tee -a Launch.sh <<< '-machine q35,${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,readonly,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 \' \
@ -206,10 +214,9 @@ RUN touch Launch.sh \
    && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=qcow2 \' \
    && tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=${IMAGE_PATH:-/home/arch/OSX-KVM/mac_hdd_ng.img},format=${IMAGE_FORMAT:-qcow2} \' \
    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.4,drive=MacHDD \' \
-    && 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 <<< '-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:-}'

@ -224,38 +231,16 @@ USER arch

 ENV USER arch

-# 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
-
-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 \
-    ; 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=

-# 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.
@ -271,14 +256,8 @@ 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
@ -319,7 +298,7 @@ VOLUME ["/tmp/.X11-unix"]
 # 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 \
+    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
    ; [[ "${NOPICKER}" == true ]] && { \
        sed -i '/^.*InstallMedia.*/d' Launch.sh \
        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@ -7,7 +7,7 @@
 # 
 # Title:            Docker-OSX (Mac on Docker)
 # Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          6.0
+# Version:          4.3
 # License:          GPLv3+
 # Repository:       https://github.com/sickcodes/Docker-OSX
 # Website:          https://sick.codes
@ -56,7 +56,6 @@ ARG SCROT
 ARG RANKMIRRORS
 ARG MIRROR_COUNTRY=US
 ARG MIRROR_COUNT=10
-
 RUN if [[ "${RANKMIRRORS}" ]]; then \
        { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
        ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \
@ -88,24 +87,21 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
    ; fi \
    ; yes | pacman -Scc

+# TEMP-FIX for pacman issue
+RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
+# TEMP-FIX for pacman issue
+
+# TEMP-FIX for file 5.40 libguestfs issue
+RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
+    && patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
+# TEMP-FIX for file 5.40 libguestfs issue
+
 USER arch

-ENV USER arch
-
-# 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
-
-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 \
-    ; sudo rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool
-
 WORKDIR /home/arch/OSX-KVM

 RUN mkdir -p ~/.ssh \
@ -139,14 +135,8 @@ RUN if [[ "${COMPLETE}" ]]; then \

 ENV ADDITIONAL_PORTS=

-# add additional QEMU boot arguments
-ENV BOOT_ARGS=
-
 ENV BOOTDISK=

-# edit the CPU that is beign emulated
-ENV CPU=Penryn
-
 ENV DISPLAY=:99

 ENV HEADLESS=false
@ -171,10 +161,6 @@ 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
@ -197,7 +183,7 @@ CMD echo "${BOILERPLATE}" \
    ; [[ "${TERMS_OF_USE}" = i_agree ]] || exit 1 \
    ; 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 \
+    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
    ; [[ "${NOPICKER}" == true ]] && { \
        sed -i '/^.*InstallMedia.*/d' Launch.sh \
        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
@ -211,7 +197,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-Catalina/OpenCore.qcow2}" \
            --output-env "${ENV:=/env}" \
    || exit 1 ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@ -225,7 +211,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-Catalina/OpenCore.qcow2}"  \
    || exit 1 ; } \
    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
        nohup Xvfb :99 -screen 0 1920x1080x16 \
@ -240,13 +226,13 @@ CMD echo "${BOILERPLATE}" \
    ; } \
    ; /bin/bash -c ./Launch.sh \
    & echo "Booting Docker-OSX in the background. Please wait..." \
-    ; until [[ "$(sshpass -p${PASSWORD:=alpine} ssh-copy-id -f -i ~/.ssh/id_docker_osx.pub -p 10022 ${USERNAME:=user}@127.0.0.1)" ]]; do \
+    ; until [[ "$(sshpass -palpine ssh-copy-id -f -i ~/.ssh/id_docker_osx.pub -p 10022 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 \
    ; grep id_docker_osx ~/.ssh/config || { \
        tee -a ~/.ssh/config <<< 'Host 127.0.0.1' \
-        ; tee -a ~/.ssh/config <<< "    User ${USERNAME:=user}" \
+        ; tee -a ~/.ssh/config <<< '    User user' \
        ; tee -a ~/.ssh/config <<< '    Port 10022' \
        ; tee -a ~/.ssh/config <<< '    IdentityFile ~/.ssh/id_docker_osx' \
        ; tee -a ~/.ssh/config <<< '    StrictHostKeyChecking no' \
@ -255,7 +241,7 @@ CMD echo "${BOILERPLATE}" \
    && echo 'Default username: user' \
    && echo 'Default password: alpine' \
    && echo 'Change it immediately using the command: passwd' \
-    && ssh -i ~/.ssh/id_docker_osx ${USERNAME:=user}@127.0.0.1 -p 10022 "${OSX_COMMANDS}"
+    && ssh -i ~/.ssh/id_docker_osx user@127.0.0.1 -p 10022 "${OSX_COMMANDS}"

 # username: user
 # password: alpine
--- a/Dockerfile.monterey
+++ b/Dockerfile.monterey
@ -1,223 +0,0 @@
-#!/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-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 \' \
-    && 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
-
-# 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
-
-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 \
-    ; 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=
-
-# 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-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-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
-
-# 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
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@ -7,7 +7,7 @@
 # 
 # Title:            Docker-OSX (Mac on Docker)
 # Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          6.0
+# Version:          4.3
 # License:          GPLv3+
 # Repository:       https://github.com/sickcodes/Docker-OSX
 # Website:          https://sick.codes
@ -46,16 +46,15 @@ ARG RANKMIRRORS
 ARG MIRROR_COUNTRY=US
 ARG MIRROR_COUNT=10
 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' \
-        | head -n "$((${MIRROR_COUNT:-10}+1))" \
-        | bash ./rankmirrors --verbose --max-time 5 - > /etc/pacman.d/mirrorlist \
-        && 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
+    ; 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' \
+    | head -n "$((${MIRROR_COUNT:-10}+1))" \
+    | bash ./rankmirrors --verbose --max-time 5 - > /etc/pacman.d/mirrorlist \
+    && 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

 # For taking screenshots of the Xfvb screen, useful during development.
 ARG SCROT
@ -77,24 +76,21 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
    ; fi \
    ; yes | pacman -Scc

+# TEMP-FIX for pacman issue
+RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
+# TEMP-FIX for pacman issue
+
+# TEMP-FIX for file 5.40 libguestfs issue
+RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
+    && patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
+# TEMP-FIX for file 5.40 libguestfs issue
+
 USER arch

-ENV USER arch
-
-# 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
-
-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 \
-    ; sudo rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool
-
 WORKDIR /home/arch/OSX-KVM

 RUN mkdir -p ~/.ssh \
@ -111,14 +107,8 @@ RUN mkdir -p ~/.ssh \

 ENV ADDITIONAL_PORTS=

-# add additional QEMU boot arguments
-ENV BOOT_ARGS=
-
 ENV BOOTDISK=

-# edit the CPU that is beign emulated
-ENV CPU=Penryn
-
 ENV DISPLAY=:99

 ENV HEADLESS=false
@ -158,7 +148,7 @@ 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 \
+    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
        nohup Xvfb :99 -screen 0 1920x1080x16 \
        & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
--- a/Dockerfile.naked-auto
+++ b/Dockerfile.naked-auto
@ -1,236 +0,0 @@
-#!/usr/bin/docker
-#     ____             __             ____  ______  __
-#    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
-#   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   / 
-#  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |  
-# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_|  :NAKED-AUTO
-# 
-# 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
-# 
-# This Dockerfile needs you to supply a pre-installed installation of Docker-OSX!
-# 
-# Visit https://github.com/sickcodes/Docker-OSX for info
-
-FROM sickcodes/docker-osx:latest
-
-MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes>
-
-USER root
-
-WORKDIR /root
-
-RUN rm -f /home/arch/OSX-KVM/mac_hdd_ng.img
-
-# For taking screenshots of the Xfvb screen, useful during development.
-ARG SCROT
-
-# 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 ; } \
-        ; 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' \
-        | head -n "$((${MIRROR_COUNT:-10}+1))" \
-        | bash ./rankmirrors --verbose --max-time 5 - > /etc/pacman.d/mirrorlist \
-        && 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 \
-    ; yes | pacman -Scc
-
-# For taking screenshots of the Xfvb screen, useful during development.
-ARG SCROT
-
-RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
-    && if [[ "${SCROT}" ]]; then \
-        pacman -Syu scrot base-devel --noconfirm \
-        && git clone --recurse-submodules --depth 1 https://github.com/stolk/imcat.git \
-        && cd imcat \
-        && make \
-        && sudo cp imcat /usr/bin/imcat \
-        && touch /usr/bin/scrotcat \
-        && tee -a /usr/bin/scrotcat <<< '/usr/bin/imcat <(scrot -o /dev/stdout)' \
-        && chmod +x /usr/bin/scrotcat \
-    ; else \
-        touch /usr/bin/scrotcat \
-        && echo echo >> /usr/bin/scrotcat \
-        && chmod +x /usr/bin/scrotcat \
-    ; fi \
-    ; yes | pacman -Scc
-
-USER arch
-
-ENV USER arch
-
-# 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
-
-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 \
-    ; sudo rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool
-
-WORKDIR /home/arch/OSX-KVM
-
-RUN mkdir -p ~/.ssh \
-    && touch ~/.ssh/authorized_keys \
-    && touch ~/.ssh/config \
-    && chmod 700 ~/.ssh \
-    && chmod 600 ~/.ssh/config \
-    && chmod 600 ~/.ssh/authorized_keys \
-    && tee -a ~/.ssh/config <<< 'Host *' \
-    && tee -a ~/.ssh/config <<< '    StrictHostKeyChecking no' \
-    && tee -a ~/.ssh/config <<< '    UserKnownHostsFile=/dev/null'
-
-ARG COMPLETE=
-
-# use the COMPLETE arg, for a complete image, ready to boot.
-# otherwise use your own image: -v "$PWD/disk.img":/image
-ARG WGET_OPTIONS=
-# ARG WGET_OPTIONS='--no-verbose'
-
-# Feel free to take a copy of this image and then host it internally
-ARG IMAGE_URL=
-# ARG IMAGE_URL='https://images.sick.codes/mac_hdd_ng_auto_big_sur.img'
-
-RUN if [[ "${COMPLETE}" ]]; then \
-        echo "Downloading your image... This step might take a while... Press Ctrl+C if you want to abort." \
-        ; rm -f /home/arch/OSX-KVM/mac_hdd_ng.img \
-        && wget ${WGET_OPTIONS} -O /home/arch/OSX-KVM/mac_hdd_ng.img "${IMAGE_URL}" \
-    ; fi
-
-#### SPECIAL RUNTIME ARGUMENTS BELOW
-
-ENV ADDITIONAL_PORTS=
-
-# add additional QEMU boot arguments
-ENV BOOT_ARGS=
-
-ENV BOOTDISK=
-
-# edit the CPU that is beign emulated
-ENV CPU=Penryn
-
-ENV DISPLAY=:99
-
-ENV HEADLESS=false
-
-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=/image
-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
-
-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
-# 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
-
-ENV TERMS_OF_USE=i_agree
-
-ENV BOILERPLATE="By using this Dockerfile, you hereby agree that you are a security reseacher or developer and agree to use this Dockerfile to make the world a safer place. Examples include: making your apps safer, finding your mobile phone, compiling security products, etc. You understand that Docker-OSX is an Open Source project, which is released to the public under the GNU Pulic License version 3 and above. You acknowledge that the Open Source project is absolutely unaffiliated with any third party, in any form whatsoever. Any trademarks or intelectual property which happen to be mentioned anywhere in or around the project are owned by their respective owners. By using this Dockerfile, you agree to agree to the EULA of each piece of upstream or downstream software. The following code is released for the sole purpose of security research, under the GNU Public License version 3. If you are concerned about the licensing, please note that this project is not AGPL. A copy of the license is available online: https://github.com/sickcodes/Docker-OSX/blob/master/LICENSE. In order to use the following Dockerfile you must read and understand the terms. Once you have read the terms, use the -e TERMS_OF_USE=i_agree or -e TERMS_OF_USE=i_disagree"
-
-CMD echo "${BOILERPLATE}" \
-    ; [[ "${TERMS_OF_USE}" = i_agree ]] || exit 1 \
-    ; 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 \
-    ; [[ "${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 ; } \
-    ; { [[ "${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 \
-    ; [[ -e ~/.ssh/id_docker_osx ]] || { \
-        /usr/bin/ssh-keygen -t rsa -f ~/.ssh/id_docker_osx -q -N "" \
-        && chmod 600 ~/.ssh/id_docker_osx \
-    ; } \
-    ; /bin/bash -c ./Launch.sh \
-    & echo "Booting Docker-OSX in the background. Please wait..." \
-    ; 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 \
-    ; grep id_docker_osx ~/.ssh/config || { \
-        tee -a ~/.ssh/config <<< 'Host 127.0.0.1' \
-        ; tee -a ~/.ssh/config <<< "    User ${USERNAME:=user}" \
-        ; tee -a ~/.ssh/config <<< '    Port 10022' \
-        ; tee -a ~/.ssh/config <<< '    IdentityFile ~/.ssh/id_docker_osx' \
-        ; tee -a ~/.ssh/config <<< '    StrictHostKeyChecking no' \
-        ; tee -a ~/.ssh/config <<< '    UserKnownHostsFile=/dev/null' \
-    ; } \
-    && ssh -i ~/.ssh/id_docker_osx ${USERNAME:=user}@127.0.0.1 -p 10022 "${OSX_COMMANDS}"
--- a/README.md
+++ b/README.md
@ -2,21 +2,7 @@

 ![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! iPhone USB working! macOS in a Docker container!
-
-# 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.
-
-[![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/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/)
+Run Mac OS X in Docker with near-native performance! X11 Forwarding! iMessage security research!

 ## Author

@ -26,23 +12,18 @@ Additional credits can be found here: https://github.com/sickcodes/Docker-OSX/bl

 Additionally, comprehensive list of all contributors can be found here: https://github.com/sickcodes/Docker-OSX/graphs/contributors

-Big thanks to [@kholia](https://twitter.com/kholia) for maintaining the upstream project, which Docker-OSX is built on top of: [OSX-KVM](https://github.com/kholia/OSX-KVM).
+Special thanks to [@kholia](https://twitter.com/kholia) for maintaining the upstream project, which Docker-OSX is built on top of: [OSX-KVM](https://github.com/kholia/OSX-KVM).

-Also special thanks to [@thenickdude](https://github.com/thenickdude) who maintains the valuable fork [KVM-OpenCore](https://github.com/thenickdude/KVM-Opencore), which was started by [@Leoyzen](https://github.com/Leoyzen/)!
-
-Extra special thanks to the OpenCore team over at: https://github.com/acidanthera/OpenCorePkg. Their well-maintained bootloader provides much of the great functionality that Docker-OSX users enjoy :)
+Big thanks to the OpenCore team over at: https://github.com/acidanthera/OpenCorePkg. Their well-maintained bootloader provides much of the great functionality that Docker-OSX users enjoy :)

 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>
+[![dockeri.co](https://dockeri.co/image/sickcodes/docker-osx)](https://hub.docker.com/r/sickcodes/docker-osx)

 ## Quick Start Docker-OSX

 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/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)

 ```bash
@ -52,8 +33,6 @@ 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)

@ -64,237 +43,27 @@ 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)
-
-```bash
-# 40GB disk space required: 20GB original image 20GB your container.
-docker pull sickcodes/docker-osx:auto
-
-# boot directly into a real OS X shell with a visual display [NOT HEADLESS]
-docker run -it \
-    --device /dev/kvm \
-    -p 50922:10022 \
-    -v /tmp/.X11-unix:/tmp/.X11-unix \
-    -e "DISPLAY=${DISPLAY:-:0.0}" \
-    sickcodes/docker-osx:auto
-
-# username is user
-# passsword is alpine
-```
-
-#### 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)
-
-
-This is a particularly good way for downloading the container, in case Docker's CDN (or your connection) happens to be slow.
-
-```bash
-wget https://images2.sick.codes/mac_hdd_ng_auto.img
-
-docker run -it \
-    --device /dev/kvm \
-    -p 50922:10022 \
-    -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
-```
-
-
-#### Use your own image and manually and automatically log into a shell
-
-[![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 "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
-
-docker run -it \
-    --device /dev/kvm \
-    -p 50922:10022 \
-    -v "${PWD}/mac_hdd_ng_auto.img:/image" \
-    -v /tmp/.X11-unix:/tmp/.X11-unix \
-    -e "DISPLAY=${DISPLAY:-:0.0}" \
-    -e "USERNAME=user" \
-    -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
-```
-
-# (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 Virtual Instances.
- Disable heavy login screen wallpaper
- Disable updates (at your own risk!)
-
-## Important notices:
-
-**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

-There currently five images, each with different use cases (explained [below](#container-images)):
-
- Catalina
- Big Sur
- Auto (pre-made Catalina)
- Naked (use your own .img)
- Naked-Auto (user your own .img and SSH in)
-
-Catalina make your own image:
+There currently four images, each with different use cases (explained [below](#container-images)):

 [![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 make your own image:
+[![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)

 [![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)

-Bring-your-own-image setup (use any of the above first):
+This special set of images was developed by [Sick.Codes](https://sick.codes).

-[![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)
-
-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!
- macOS Monterey!
- Folder sharing
+The images (excluding `:naked`) launch a container with an existing installation with a couple of premade configurations:
+- username: `user`, password: `alpine`
 - SSH enabled (`localhost:50922`)
 - VNC enabled (`localhost:8888`) if using ./vnc version
+- auto-updates disabled
 - [serial number generator!](https://github.com/sickcodes/osx-serial-generator)
 - X11 forwarding is enabled
 - runs on top of QEMU + KVM
@ -359,9 +128,8 @@ In case you're interested, contact [@sickcodes on Twitter](https://twitter.com/s
 Docker-OSX is licensed under the [GPL v3+](LICENSE). Contributions are welcomed and immensely appreciated. You are in-fact permitted to use Docker-OSX as a tool to create proprietary software.

 ### Other cool Docker/QEMU based projects
- [Run Android in a Docker Container with Dock Droid](https://github.com/sickcodes/dock-droid)
- [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 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 iMessage relayer in Docker with Bluebubbles.app](https://bluebubbles.app/) - [Getting started wiki](https://github.com/BlueBubblesApp/BlueBubbles-Server/wiki/Running-via-Docker)

 ## Disclaimer
@ -382,12 +150,11 @@ There are several different Docker-OSX images available which are suitable for d
 - `sickcodes/docker-osx:latest` - [I want to use Docker-OSX to develop/secure apps in Xcode (sign into Xcode, Transporter)](#quick-start-your-own-image-naked-container-image)
 - `sickcodes/docker-osx:naked` - [I want to use Docker-OSX for CI/CD-related purposes (sign into Xcode, Transporter)](#building-a-headless-container-from-a-custom-image)

-Create your personal image using `:latest` or `big-sur`. Then, pull the image out the image. Afterwards, you will be able to duplicate that image and import it to the `:naked` container, in order to revert the container to a previous state repeatedly.
+Create your personal image using `:latest`. Then, extract the image. Afterwards, you will be able to duplicate that image and import it to the `:naked` container, in order to revert the container to a previous state repeatedly.

 - `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.
@ -399,7 +166,7 @@ Then, you'll need QEMU and some other dependencies on your host:
 sudo pacman -S qemu libvirt dnsmasq virt-manager bridge-utils flex bison iptables-nft edk2-ovmf

 # UBUNTU DEBIAN
-sudo apt install qemu qemu-kvm libvirt-clients libvirt-daemon-system bridge-utils virt-manager libguestfs-tools
+sudo apt install qemu qemu-kvm libvirt-clients libvirt-daemon-system bridge-utils virt-manager

 # CENTOS RHEL FEDORA
 sudo yum install libvirt qemu-kvm
@ -443,42 +210,6 @@ 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.
@ -518,6 +249,51 @@ 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)

@ -559,7 +335,7 @@ docker ps -a
 docker start -ai -i <Replace this with your ID>
 ```

-### LibGTK errors "connection refused"
+### LibGTK errors

 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.

@ -715,77 +491,6 @@ 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:
@ -911,10 +616,7 @@ 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

-# test some commands
-sshpass -p 'alpine' ssh user@localhost -p 50922 'ping google.com'
-
-# check your serial number
+# or from the host
 sshpass -p 'alpine' ssh user@localhost -p 50922 'ioreg -l | grep IOPlatformSerialNumber'
 ```

@ -978,9 +680,8 @@ 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
@ -1087,10 +788,7 @@ Or tell the container to use specific ones using `-e GENERATE_SPECIFIC=true`

 ### I'd like to run Docker-OSX with WSL2 (Windows, Ubuntu)

-Ensure KVM is enabled and `x11-apps` is installed.
-
-to void troubles related to docker daemons on WLS 2, use Docker on Windows, and extern it to your distro.
-See Docker Docs for the complete detail setup [here](https://docs.docker.com/docker-for-windows/wsl/)
+Ensure KVM is enabled and `x11-apps` is installed. 

 See more in-depth discussion [here](https://github.com/sickcodes/Docker-OSX/issues/17) and [here](https://github.com/sickcodes/Docker-OSX/issues/60).

@ -1238,45 +936,6 @@ docker run -it \

 See also: [here](https://github.com/sickcodes/Docker-OSX/issues/222).

-
-#### Extracting the APFS disk on Linux
-
-In Docker-OSX, we are using `qcow2` images.
-
-This means the image grows as you use it, but the guest OS thinks you have 200GB available.
-
-
-**READ ONLY**
-
-```bash
-# mount the qemu image like a real disk
-sudo modprobe nbd max_part=8
-sudo qemu-nbd --connect=/dev/nbd0 ./image.img
-sudo fdisk /dev/nbd0 -l
-
-mkdir -p ./mnt
-sudo mount /dev/nbd0p1 ./mnt
-
-# inspect partitions (2 partitions)
-sudo fdisk /dev/nbd0 -l
-
-# mount using apfs-linux-rw OR apfs-fuse
-mkdir -p ./part
-
-sudo mount /dev/nbd0p2 ./part
-sudo apfs-fuse -o allow_other /dev/nbd0p2 ./part
-
-```
-
-When you are finishing looking at your disk, you can unmount the partition, the disk, and remove the loopback device:
-
-```bash
-sudo umount ./part
-sudo umount ./mnt
-sudo qemu-nbd --disconnect /dev/nbd0
-sudo rmmod nbd
-```
-
 ### USB Passthrough

 Firstly, QEMU must be started as root. 
@ -1380,12 +1039,29 @@ The Quick Start command should work out of the box, provided that you keep the f
    -e "DISPLAY=${DISPLAY:-:0.0}" \
 ```

+#### 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)
+
+
+This is a particularly good way for downloading the container, in case Docker's CDN (or your connection) happens to be slow.
+
+```bash
+wget https://images2.sick.codes/mac_hdd_ng_auto.img
+
+docker run -it \
+    --device /dev/kvm \
+    -p 50922:10022 \
+    -v "${PWD}/mac_hdd_ng_auto.img:/image" \
+    -v /tmp/.X11-unix:/tmp/.X11-unix \
+    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    sickcodes/docker-osx:naked
+```
+
 #### Prebuilt image with arbitrary command line arguments 

 [![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)

-`-e OSX_COMMANDS` lets you run any commands inside the container
-
 ```bash
 docker pull sickcodes/docker-osx:auto

@ -1395,35 +1071,12 @@ docker run -it \
    -p 50922:10022 \
    -v /tmp/.X11-unix:/tmp/.X11-unix \
    -e "DISPLAY=${DISPLAY:-:0.0}" \
-    -e "OSX_COMMANDS=/bin/bash -c \"put your commands here\"" \
+    -e "OSX_COMMANDS=/bin/bash -c \"pwd && uname -a\"" \
    sickcodes/docker-osx:auto

 # 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
-docker pull sickcodes/docker-osx:naked-auto
-
-# boot to OS X shell + display + specify commands to run inside OS X!
-docker run -it \
-    --device /dev/kvm \
-    -p 50922:10022 \
-    -v /tmp/.X11-unix:/tmp/.X11-unix \
-    -e "DISPLAY=${DISPLAY:-:0.0}" \
-    -e USERNAME=yourusername \
-    -e PASSWORD=yourpassword \
-    -e "OSX_COMMANDS=/bin/bash -c \"put your commands here\"" \
-    sickcodes/docker-osx:naked-auto
-
-# Boots in a minute or two!
-
-```
-
 ### Further examples

 There's a myriad of other potential use cases that can work perfectly with Docker-OSX, some of which you'll see below!
@ -1467,12 +1120,11 @@ docker run -i \
    -p 5999:5999 \
    -v /tmp/.X11-unix:/tmp/.X11-unix \
    -e "DISPLAY=${DISPLAY:-:0.0}" \
-    -e EXTRA="-display none -vnc 0.0.0.0:99,password=on" \
+    -e EXTRA="-display none -vnc 0.0.0.0:99,password" \
    sickcodes/docker-osx:big-sur

-# type `change vnc password myvncusername` into the docker terminal and set a password
+# type `change vnc password` into the docker terminal and set a password
 # connect to localhost:5999 using VNC
-# qemu 6 seems to require a username for vnc now
 ```

 **NOT TLS/HTTPS Encrypted at all!**
@ -1485,13 +1137,11 @@ Or `ssh -N root@1.1.1.1 -L  5999:127.0.0.1:5999`, where `1.1.1.1` is your remote

 Add the following line:

-`-e EXTRA="-display none -vnc 0.0.0.0:99,password=on"`
+`-e EXTRA="-display none -vnc 0.0.0.0:99,password"`

 In the Docker terminal, press `enter` until you see `(qemu)`.

-Type `change vnc password someusername`
-
-Enter a password for your new vnc username^.
+Type `change vnc password`

 You also need the container IP: `docker inspect <containerid> | jq -r '.[0].NetworkSettings.IPAddress'`

@ -1512,7 +1162,6 @@ 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" \
@ -1539,6 +1188,23 @@ docker run \
    newImageName
 ```

+#### 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)
+
+```bash
+docker pull sickcodes/docker-osx:auto
+
+# boot directly into a real OS X shell with a visual display [NOT HEADLESS]
+docker run -it \
+    --device /dev/kvm \
+    -p 50922:10022 \
+    -v /tmp/.X11-unix:/tmp/.X11-unix \
+    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    sickcodes/docker-osx:auto
+
+# username is user
+# passsword is alpine
+```
+
 ```bash
 docker pull sickcodes/docker-osx:auto

@ -1609,52 +1275,3 @@ 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).
-
--- a/discord-logo.svg
+++ b/discord-logo.svg
@ -1,14 +0,0 @@
-<!-- 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>
--- a/fetch-macOS.py
+++ b/fetch-macOS.py
@ -87,8 +87,8 @@ class ReplicationError(Exception):


 def cmd_exists(cmd):
-    return subprocess.Popen("type " + cmd, shell=True,
-                           stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    return subprocess.call("type " + cmd, shell=True,
+                           stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0


 def replicate_url(full_url,
--- a/2
+++ b/2
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@ -1,112 +0,0 @@
-#!/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/test.sh
+++ b/tests/test.sh
@ -33,7 +33,6 @@ 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
@ -123,9 +122,7 @@ NO_CACHE="${NO_CACHE:=--no-cache}"
 TEST_BUILDS=(
 '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'
 )
@ -224,16 +221,6 @@ docker-osx:naked () {
 }


-docker-osx:naked-auto () {
-    docker build ${NO_CACHE} \
-        --build-arg RANKMIRRORS=true \
-        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
-        -f ./Dockerfile.naked-auto \
-        -t 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 \
@ -244,15 +231,6 @@ 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 \
@ -312,9 +290,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 \
        && docker push sickcodes/docker-osx:auto-big-sur \
        && touch PUSHED
--- a/vnc-version/Dockerfile.nakedvnc
+++ b/vnc-version/Dockerfile.nakedvnc
@ -3,11 +3,11 @@
 #    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
 #   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   / 
 #  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |  
-# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_|  :NAKEDVNC
+# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_|  :NAKED
 # 
 # Title:            Docker-OSX (Mac on Docker)
 # Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          4.4
+# Version:          4.3
 # License:          GPLv3+
 # Repository:       https://github.com/sickcodes/Docker-OSX
 # Website:          https://sick.codes
@ -19,15 +19,15 @@
 #
 # Build:
 # 
-#       docker build -t docker-osx:nakedvnc -f Dockerfile.nakedvnc .
+#       docker build -t docker-osx:naked -f Dockerfile.naked .
 # 
 # Run headless:
 # 
-#       docker run -it --device /dev/kvm -p 50922:10022 -v ${PWD}/mac_hdd_ng.img:/image docker-osx:nakedvnc
+#       docker run -it --device /dev/kvm -p 50922:10022 -v ${PWD}/mac_hdd_ng.img:/image docker-osx:naked
 # 
 # Run with display:
 # 
-#       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:nakedvnc
+#       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 sickcodes/docker-osx:latest
@ -106,14 +106,8 @@ RUN mkdir -p ~/.ssh \

 ENV ADDITIONAL_PORTS=

-# add additional QEMU boot arguments
-ENV BOOT_ARGS=
-
 ENV BOOTDISK=

-# edit the CPU that is beign emulated
-ENV CPU=Penryn
-
 ENV DISPLAY=:99

 ENV HEADLESS=false
@ -148,12 +142,8 @@ ENV RAM=8
 ENV WIDTH=1920
 ENV HEIGHT=1080

-# 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 \
+CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
+    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
        nohup Xvfb :99 -screen 0 1920x1080x16 \
        & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
@ -173,7 +163,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}"  2>/dev/
            --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 \
@ -186,7 +176,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}"  2>/dev/
            --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

 WORKDIR /home/arch/OSX-KVM
@ -199,13 +189,6 @@ RUN sudo pacman -Syyuu --noconfirm \
    && tee -a ~/.vnc/config <<< 'localhost' \
    && tee -a ~/.vnc/config <<< 'alwaysshared'

-# TEMP-FIX for file 5.40 libguestfs issue
-RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
-    && patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
-    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
-    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
-# TEMP-FIX for file 5.40 libguestfs issue
-
 RUN printf '\n%s\n' \
 'sudo rm -f /tmp/.X99-lock' \
 'export DISPLAY=:99' \
Author	SHA1	Message	Date
sickcodes	57f1532dd1	Merge branch 'master' into glibc-revert-wip	2021-05-02 23:45:04 +00:00
sickcodes	b79f26a508	Revert glibc patch when applicable.	2021-03-01 11:32:23 +00:00