Move /home/arch/OSX-KVM to /home/arch/Docker-OSX/OSX-KVM, but symlink it anyway

If you put an image at /imamge, the image will use that at runtime. Move OSX-KVM to submodule, and symlink for perfect redundancy ln -s /home/arch/Docker-OSX/OSX-KVM /home/arch/OSX-KVM
2025-07-03 03:03:31 -05:00 · 2022-02-24 00:45:19 +00:00 · 2022-02-24 00:41:55 +00:00
16 changed files with 254 additions and 302 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,6 @@
 [submodule "osx-serial-generator"]
 	path = osx-serial-generator
 	url = https://github.com/sickcodes/osx-serial-generator.git
+[submodule "OSX-KVM"]
+	path = OSX-KVM
+	url = https://github.com/kholia/OSX-KVM
--- a/CREDITS.md
+++ b/CREDITS.md
@ -120,12 +120,4 @@ This project now uses the fantastic OpenCore bootloader from the community OpenC

 [@aslafy-z](https://github.com/aslafy-z) chore(docs): update helm requirements list style #420

-[@kimjammer](https://github.com/kimjammer) Update Windows Installation section #422 
-
-[@Mhartig](https://github.com/Mhartig) -  Worked out issue `Enter a number (default=1): error: invalid number: y`
-
-[@felipestt](https://github.com/felipestt)  Use more CPU Cores/SMP' broken #440 
-
-[@routmoute](https://github.com/routmoute) README: add PulseAudio with WSLg #442 
-
-[@dulatello08](https://github.com/dulatello08) Update README.md #452
+@Mhartig -  Worked out issue `Enter a number (default=1): error: invalid number: y`
--- a/121
+++ b/121
@ -24,7 +24,6 @@
 #
 #       docker build -t docker-osx .
 #       docker build -t docker-osx --build-arg VERSION=10.15.5 --build-arg SIZE=200G .
-#       docker build -t docker-osx-sonoma --build-arg BRANCH=sonoma --build-arg SHORTNAME=sonoma .
 #
 # Basic Run:
 #
@ -59,42 +58,28 @@ 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 PARALLEL_DOWNLOADS=30

 # OPTIONAL: Arch Linux server mirrors for super fast builds
 # set RANKMIRRORS to any value other that nothing, e.g. -e RANKMIRRORS=true
-RUN perl -i -p -e s/^\#Color/Color$'\n'ParallelDownloads\ =\ ${PARALLEL_DOWNLOADS:=30}/g /etc/pacman.conf 

+RUN perl -i -p -e s/^\#Color/Color$'\n'ParallelDownloads\ =\ 30/g /etc/pacman.conf 
 ARG RANKMIRRORS
 ARG MIRROR_COUNTRY=US
 ARG MIRROR_COUNT=10

-RUN tee /etc/pacman.d/mirrorlist <<< 'Server = https://geo.mirror.pkgbuild.com/$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'
-
-# Fixes issue with invalid GPG keys: update the archlinux-keyring package to get the latest keys, then remove and regenerate gnupg keys
-RUN pacman -Sy archlinux-keyring --noconfirm \
-    && rm -rf /etc/pacman.d/gnupg \
-    && pacman-key --init \
-    && pacman-key --populate archlinux
-
 RUN if [[ "${RANKMIRRORS}" ]]; then \
        { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
-        ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/${BRANCH:=master}/rankmirrors" \
+        ; 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

-RUN tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkp://keyserver.ubuntu.com' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://hkps.pool.sks-keyservers.net:443' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkp://pgp.mit.edu:11371' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://keys.openpgp.org' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://keys.mailvelope.com'
-
 # This fails on hub.docker.com, useful for debugging in cloud
 # RUN [[ $(egrep -c '(svm|vmx)' /proc/cpuinfo) -gt 0 ]] || { echo KVM not possible on this host && exit 1; }

@ -105,11 +90,11 @@ RUN pacman -Syu git zip vim nano alsa-utils openssh --noconfirm \
    && ln -s /bin/vim /bin/vi \
    && useradd arch -p arch \
    && tee -a /etc/sudoers <<< 'arch ALL=(ALL) NOPASSWD: ALL' \
-    && mkdir -p /home/arch \
+    && mkdir /home/arch \
    && chown arch:arch /home/arch

 # allow ssh to container
-RUN mkdir -p -m 700 /root/.ssh
+RUN mkdir -m 700 /root/.ssh

 WORKDIR /root/.ssh
 RUN touch authorized_keys \
@ -128,14 +113,17 @@ RUN tee -a sshd_config <<< 'AllowTcpForwarding yes' \

 USER arch

-# download OSX-KVM for the submodules
-RUN git clone --recurse-submodules --depth 1 https://github.com/kholia/OSX-KVM.git /home/arch/OSX-KVM
+# download OSX-KVM
+# RUN git clone --recurse-submodules --depth 1 https://github.com/kholia/OSX-KVM.git /home/arch/Docker-OSX/OSX-KVM
+RUN git clone --recurse-submodules --depth 1 https://github.com/sickcodes/Docker-OSX.git /home/arch/Docker-OSX
+
+# Create a symbolic link from OSX-KVM to submodule directory as we are using as a submodule instead now (redunancy proof)
+RUN ln -s /home/arch/Docker-OSX/OSX-KVM /home/arch/OSX-KVM

 # enable ssh
 # docker exec .... ./enable-ssh.sh
-USER arch

-WORKDIR /home/arch/OSX-KVM
+WORKDIR /home/arch/Docker-OSX

 RUN touch enable-ssh.sh \
    && chmod +x ./enable-ssh.sh \
@ -154,40 +142,31 @@ RUN touch enable-ssh.sh \

 # RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils edk2-ovmf netctl libvirt-dbus --overwrite --noconfirm

-RUN yes | sudo pacman -Syu bc qemu-desktop libvirt dnsmasq virt-manager bridge-utils openresolv jack2 ebtables edk2-ovmf netctl libvirt-dbus wget scrot --overwrite --noconfirm \
+RUN yes | sudo pacman -Syu bc qemu libvirt dnsmasq virt-manager bridge-utils openresolv jack2 ebtables edk2-ovmf netctl libvirt-dbus wget --overwrite --noconfirm \
    && yes | sudo pacman -Scc

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

-# shortname default is catalina, which means :latest is catalina
 ARG SHORTNAME=catalina

 RUN make \
    && qemu-img convert BaseSystem.dmg -O qcow2 -p -c BaseSystem.img \
    && rm ./BaseSystem.dmg

-# fix invalid signature on old libguestfs
-ARG SIGLEVEL=Never
-
-RUN sudo tee -a /etc/pacman.conf <<< "SigLevel = ${SIGLEVEL}" \
-    && sudo tee -a /etc/pacman.conf <<< 'RemoteFileSigLevel = Optional' \
-    && sudo sed -i -e 's/^\#RemoteFileSigLevel/RemoteFileSigLevel/g' /etc/pacman.conf
-
 ARG LINUX=true

 # required to use libguestfs inside a docker container, to create bootdisks for docker-osx on-the-fly
-# reminder this is what makes :naked image larger than expected
 RUN if [[ "${LINUX}" == true ]]; then \
-        sudo pacman -Syu linux linux-headers archlinux-keyring guestfs-tools mkinitcpio pcre pcre2 --noconfirm \
-        && libguestfs-test-tool \
-        && rm -rf /var/tmp/.guestfs-* \
-        && yes | sudo pacman -Scc \
+        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:=master}" "${REPO:=https://github.com/sickcodes/Docker-OSX.git}"
+# RUN git clone --recurse-submodules --depth 1 --branch "${BRANCH}" "${REPO}"
+RUN git clone --recurse-submodules --depth 1 --branch "${BRANCH}" "${REPO}"

 RUN touch Launch.sh \
    && chmod +x ./Launch.sh \
@ -202,19 +181,18 @@ RUN touch Launch.sh \
    && 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 <<< '-device qemu-xhci,id=xhci \' \
-    && tee -a Launch.sh <<< '-device usb-kbd,bus=xhci.0 -device usb-tablet,bus=xhci.0 \' \
+    && 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 <<< '-drive if=pflash,format=raw,readonly=on,file=/home/arch/Docker-OSX/OSX-KVM/OVMF_CODE.fd \' \
+    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,file=/home/arch/Docker-OSX/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 <<< '-drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file=${BOOTDISK:-/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore.qcow2} \' \
    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.2,drive=OpenCoreBoot \' \
    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.3,drive=InstallMedia \' \
-    && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=${BASESYSTEM_FORMAT:-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 <<< '-drive id=InstallMedia,if=none,file=/home/arch/Docker-OSX/OSX-KVM/BaseSystem.img,format=${BASESYSTEM_FORMAT:-qcow2} \' \
+    && tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=${IMAGE_PATH:-/home/arch/Docker-OSX/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} \' \
@ -237,6 +215,32 @@ 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 KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
+
+# fix ad hoc errors from using the arch museum to get libguestfs
+RUN sudo sed -i -e 's/^\#RemoteFileSigLevel/RemoteFileSigLevel/g' /etc/pacman.conf
+
+RUN sudo pacman -Syy \
+    && sudo pacman -Rns linux --noconfirm \
+    ; sudo pacman -S mkinitcpio --noconfirm \
+    && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm || exit 1 \
+    && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm || exit 1 \
+    && rm -rf /var/tmp/.guestfs-* \
+    && yes | sudo pacman -Scc \
+    && libguestfs-test-tool || exit 1 \
+    && rm -rf /var/tmp/.guestfs-*
+
+####
+
 # These are hardcoded serials for non-iMessage related research
 # Overwritten by using GENERATE_UNIQUE=true
 # Upstream removed nopicker, so we are adding it back in, at build time
@ -255,8 +259,8 @@ 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
+ARG STOCK_BOOTDISK=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore.qcow2
+ARG STOCK_BOOTDISK_NOPICKER=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2

 RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
    --master-plist-url="${STOCK_MASTER_PLIST_URL}" \
@ -283,7 +287,7 @@ RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
    ; rm -rf /var/tmp/.guestfs-*

 ### symlink the old directory as upstream has renamed a directory. Symlinking purely for backwards compatability!
-RUN ln -s /home/arch/OSX-KVM/OpenCore /home/arch/OSX-KVM/OpenCore-Catalina || true
+RUN ln -s /home/arch/Docker-OSX/OSX-KVM/OpenCore /home/arch/Docker-OSX/OSX-KVM/OpenCore-Catalina || true
 ####

 #### SPECIAL RUNTIME ARGUMENTS BELOW
@ -316,7 +320,7 @@ 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_PATH=/home/arch/Docker-OSX/OSX-KVM/mac_hdd_ng.img
 ENV IMAGE_FORMAT=qcow2

 ENV KVM='accel=kvm:tcg'
@ -364,9 +368,12 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
    ; 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/Docker-OSX/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
    ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+    ; [[ "$(fdisk -l /image)" ]] && { \
+        && export IMAGE_PATH=/image \
+    ; } \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore.qcow2}" \
    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
            --master-plist-url="${MASTER_PLIST_URL}" \
@ -375,7 +382,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --bootdisks \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore.qcow2}" \
            --output-env "${ENV:=/env}" \
    || exit 1 ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@ -389,7 +396,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --mac-address "${MAC_ADDRESS}" \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore.qcow2}" \
    || exit 1 ; } \
    ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh

--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@ -42,7 +42,7 @@

 FROM sickcodes/docker-osx:latest

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

 USER root

@ -53,41 +53,25 @@ ARG SCROT

 # OPTIONAL: Arch Linux server mirrors for super fast builds
 # set RANKMIRRORS to any value other that nothing, e.g. -e RANKMIRRORS=true
-RUN perl -i -p -e s/^\#Color/Color$'\n'ParallelDownloads\ =\ 30/g /etc/pacman.conf 
 ARG RANKMIRRORS
 ARG MIRROR_COUNTRY=US
 ARG MIRROR_COUNT=10

-RUN tee /etc/pacman.d/mirrorlist <<< 'Server = https://geo.mirror.pkgbuild.com/$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'
-
-# Fixes issue with invalid GPG keys: update the archlinux-keyring package to get the latest keys, then remove and regenerate gnupg keys
-RUN pacman -Sy archlinux-keyring --noconfirm \
-    && rm -rf /etc/pacman.d/gnupg \
-    && pacman-key --init \
-    && pacman-key --populate archlinux
-
 RUN if [[ "${RANKMIRRORS}" ]]; then \
        { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
-        ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/${BRANCH:=master}/rankmirrors" \
+        ; 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
+    ; fi \
+    ; yes | pacman -Scc

-RUN tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkp://keyserver.ubuntu.com' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://hkps.pool.sks-keyservers.net:443' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkp://pgp.mit.edu:11371' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://keys.openpgp.org' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://keys.mailvelope.com'
-    
-RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr --noconfirm \
+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 \
@ -104,14 +88,39 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr --noconfirm \
    ; fi \
    ; yes | pacman -Scc

-RUN pacman -S sshpass --noconfirm \
-    && yes | pacman -Scc
-
 USER arch

 ENV USER arch

-WORKDIR /home/arch/OSX-KVM
+
+#### libguestfs versioning
+
+# 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6
+
+ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
+ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
+ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
+ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
+
+# fix ad hoc errors from using the arch museum to get libguestfs
+RUN sudo sed -i -e 's/^\#RemoteFileSigLevel/RemoteFileSigLevel/g' /etc/pacman.conf
+
+RUN sudo pacman -Syy \
+    && sudo pacman -Rns linux --noconfirm \
+    ; sudo pacman -S mkinitcpio --noconfirm \
+    && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm || exit 1 \
+    && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm || exit 1 \
+    && rm -rf /var/tmp/.guestfs-* \
+    && yes | sudo pacman -Scc \
+    && libguestfs-test-tool || exit 1 \
+    && rm -rf /var/tmp/.guestfs-*
+
+####
+
+
+WORKDIR /home/arch/Docker-OSX/OSX-KVM

 RUN mkdir -p ~/.ssh \
    && touch ~/.ssh/authorized_keys \
@ -136,15 +145,15 @@ ARG IMAGE_URL='https://images.sick.codes/mac_hdd_ng_auto.img'

 RUN if [[ "${COMPLETE}" ]]; then \
        echo "Downloading 20GB image... This step might take a while... Press Ctrl+C if you want to abort." \
-        ; rm -f /home/arch/OSX-KVM/mac_hdd_ng.img \
-        && wget ${WGET_OPTIONS} -O /home/arch/OSX-KVM/mac_hdd_ng.img "${IMAGE_URL}" \
+        ; rm -f /home/arch/Docker-OSX/OSX-KVM/mac_hdd_ng.img \
+        && wget ${WGET_OPTIONS} -O /home/arch/Docker-OSX/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
+RUN ln -s /home/arch/Docker-OSX/OSX-KVM/OpenCore /home/arch/Docker-OSX/OSX-KVM/OpenCore-Catalina || true

 ####

@ -172,7 +181,7 @@ 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_PATH=/home/arch/Docker-OSX/OSX-KVM/mac_hdd_ng.img
 ENV IMAGE_FORMAT=qcow2

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

 FROM sickcodes/docker-osx

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

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

--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@ -32,47 +32,31 @@

 FROM sickcodes/docker-osx:latest

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

 USER root

 WORKDIR /root

-RUN rm -f /home/arch/OSX-KVM/mac_hdd_ng.img
+RUN rm -f /home/arch/Docker-OSX/OSX-KVM/mac_hdd_ng.img

 # OPTIONAL: Arch Linux server mirrors for super fast builds
 # set RANKMIRRORS to any value other that nothing, e.g. -e RANKMIRRORS=true
-RUN perl -i -p -e s/^\#Color/Color$'\n'ParallelDownloads\ =\ 30/g /etc/pacman.conf 
 ARG RANKMIRRORS
 ARG MIRROR_COUNTRY=US
 ARG MIRROR_COUNT=10
-
-RUN tee /etc/pacman.d/mirrorlist <<< 'Server = https://geo.mirror.pkgbuild.com/$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'
-
-# Fixes issue with invalid GPG keys: update the archlinux-keyring package to get the latest keys, then remove and regenerate gnupg keys
-RUN pacman -Sy archlinux-keyring --noconfirm \
-    && rm -rf /etc/pacman.d/gnupg \
-    && pacman-key --init \
-    && pacman-key --populate archlinux
-
-RUN if [[ "${RANKMIRRORS}" ]]; then \
-        { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
-        ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/${BRANCH:=master}/rankmirrors" \
+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

-RUN tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkp://keyserver.ubuntu.com' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://hkps.pool.sks-keyservers.net:443' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkp://pgp.mit.edu:11371' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://keys.openpgp.org' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://keys.mailvelope.com'
-
 # For taking screenshots of the Xfvb screen, useful during development.
 ARG SCROT

@ -97,7 +81,29 @@ USER arch

 ENV USER arch

-WORKDIR /home/arch/OSX-KVM
+#### libguestfs versioning
+
+# 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6
+
+ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
+ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
+ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
+ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
+
+RUN sudo pacman -Syy \
+    && sudo pacman -Rns linux --noconfirm \
+    ; sudo pacman -S mkinitcpio --noconfirm \
+    && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \
+    && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \
+    && rm -rf /var/tmp/.guestfs-* \
+    ; libguestfs-test-tool || exit 1
+
+####
+
+
+WORKDIR /home/arch/Docker-OSX/OSX-KVM

 RUN mkdir -p ~/.ssh \
    && touch ~/.ssh/authorized_keys \
@ -112,7 +118,7 @@ RUN mkdir -p ~/.ssh \
 ####

 # symlink the old directory, for redundancy
-RUN ln -s /home/arch/OSX-KVM/OpenCore /home/arch/OSX-KVM/OpenCore-Catalina || true
+RUN ln -s /home/arch/Docker-OSX/OSX-KVM/OpenCore /home/arch/Docker-OSX/OSX-KVM/OpenCore-Catalina || true

 ####

@ -174,9 +180,9 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
    ; } \
    ; [[ "${NOPICKER}" == true ]] && { \
        sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
+        && export BOOTDISK="${BOOTDISK:=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
    ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore.qcow2}" \
    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
            --master-plist-url="${MASTER_PLIST_URL}" \
@ -185,7 +191,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --bootdisks \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore.qcow2}" \
            --output-env "${ENV:=/env}" \
    || exit 1 ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@ -199,6 +205,6 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --mac-address "${MAC_ADDRESS}" \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore.qcow2}" \
    || exit 1 ; } \
    ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
--- a/Dockerfile.naked-auto
+++ b/Dockerfile.naked-auto
@ -18,54 +18,41 @@

 FROM sickcodes/docker-osx:latest

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

 USER root

 WORKDIR /root

-RUN rm -f /home/arch/OSX-KVM/mac_hdd_ng.img
+RUN rm -f /home/arch/Docker-OSX/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
-RUN perl -i -p -e s/^\#Color/Color$'\n'ParallelDownloads\ =\ 30/g /etc/pacman.conf 
 ARG RANKMIRRORS
 ARG MIRROR_COUNTRY=US
 ARG MIRROR_COUNT=10

-RUN tee /etc/pacman.d/mirrorlist <<< 'Server = https://geo.mirror.pkgbuild.com/$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'
-
-# Fixes issue with invalid GPG keys: update the archlinux-keyring package to get the latest keys, then remove and regenerate gnupg keys
-RUN pacman -Sy archlinux-keyring --noconfirm \
-    && rm -rf /etc/pacman.d/gnupg \
-    && pacman-key --init \
-    && pacman-key --populate archlinux
-
 RUN if [[ "${RANKMIRRORS}" ]]; then \
        { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
-        ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/${BRANCH:=master}/rankmirrors" \
+        ; 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
-
-RUN tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkp://keyserver.ubuntu.com' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://hkps.pool.sks-keyservers.net:443' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkp://pgp.mit.edu:11371' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://keys.openpgp.org' \
-    && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://keys.mailvelope.com'
+    ; 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 --noconfirm \
+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 \
@ -82,14 +69,38 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr --noconfirm \
    ; fi \
    ; yes | pacman -Scc

-RUN pacman -S sshpass --noconfirm \
-    && yes | pacman -Scc
-
 USER arch

 ENV USER arch

-WORKDIR /home/arch/OSX-KVM
+#### libguestfs versioning
+
+# 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6
+
+ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
+ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
+ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
+ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
+
+# fix ad hoc errors from using the arch museum to get libguestfs
+RUN sudo sed -i -e 's/^\#RemoteFileSigLevel/RemoteFileSigLevel/g' /etc/pacman.conf
+
+RUN sudo pacman -Syy \
+    && sudo pacman -Rns linux --noconfirm \
+    ; sudo pacman -S mkinitcpio --noconfirm \
+    && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm || exit 1 \
+    && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm || exit 1 \
+    && rm -rf /var/tmp/.guestfs-* \
+    && yes | sudo pacman -Scc \
+    && libguestfs-test-tool || exit 1 \
+    && rm -rf /var/tmp/.guestfs-*
+
+####
+
+
+WORKDIR /home/arch/Docker-OSX/OSX-KVM

 RUN mkdir -p ~/.ssh \
    && touch ~/.ssh/authorized_keys \
@ -114,14 +125,14 @@ ARG IMAGE_URL=

 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}" \
+        ; rm -f /home/arch/Docker-OSX/OSX-KVM/mac_hdd_ng.img \
+        && wget ${WGET_OPTIONS} -O /home/arch/Docker-OSX/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
+RUN ln -s /home/arch/Docker-OSX/OSX-KVM/OpenCore /home/arch/Docker-OSX/OSX-KVM/OpenCore-Catalina || true

 ####

@ -190,9 +201,9 @@ CMD echo "${BOILERPLATE}" \
    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
    ; [[ "${NOPICKER}" == true ]] && { \
        sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
+        && export BOOTDISK="${BOOTDISK:=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2}" \
    ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+    || export BOOTDISK="${BOOTDISK:=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore.qcow2}" \
    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
            --master-plist-url="${MASTER_PLIST_URL}" \
@ -201,7 +212,7 @@ CMD echo "${BOILERPLATE}" \
            --bootdisks \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore.qcow2}" \
            --output-env "${ENV:=/env}" \
    || exit 1 ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
@ -215,7 +226,7 @@ CMD echo "${BOILERPLATE}" \
            --mac-address "${MAC_ADDRESS}" \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:=/home/arch/Docker-OSX/OSX-KVM/OpenCore/OpenCore.qcow2}" \
    || exit 1 ; } \
    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
        nohup Xvfb :99 -screen 0 1920x1080x16 \
--- a/1
+++ b/1
--- a/README.md
+++ b/README.md
@ -57,31 +57,40 @@ First time here? try [initial setup](#initial-setup), otherwise try the instruct
 ### 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
+qemu-img create -f qcow2 image.img 512G
+
 docker run -it \
    --device /dev/kvm \
    -p 50922:10022 \
    -v /tmp/.X11-unix:/tmp/.X11-unix \
    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    -v "${PWD}/image.img:/image" \
    sickcodes/docker-osx:latest

 # docker build -t docker-osx .
+# if you want to keep everything inside the container, remove "${PWD}/image.img:/image" which will tell the Dockerfile to use the image at /image
 ```
 ### 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)

 ```bash
+qemu-img create -f qcow2 image.img 512G
+
 docker run -it \
    --device /dev/kvm \
    -p 50922:10022 \
    -v /tmp/.X11-unix:/tmp/.X11-unix \
    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    -v "${PWD}/image.img:/image" \
    sickcodes/docker-osx:big-sur

 # docker build -t docker-osx --build-arg SHORTNAME=big-sur .
+# if you want to keep everything inside the container, remove "${PWD}/image.img:/image" which will tell the Dockerfile to use the image at /image
 ```

 ### 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
+qemu-img create -f qcow2 image.img 512G

 docker run -it \
    --device /dev/kvm \
@ -90,45 +99,12 @@ docker run -it \
    -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' \
+    -v "${PWD}/image.img:/image" \
    sickcodes/docker-osx:monterey

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

-### Ventura [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/ventura?label=sickcodes%2Fdocker-osx%3Aventura](https://img.shields.io/docker/image-size/sickcodes/docker-osx/ventura?label=sickcodes%2Fdocker-osx%3Aventura)](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:ventura
-
-# docker build -t docker-osx --build-arg SHORTNAME=ventura .
-```
-
-### Sonoma [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/sonoma?label=sickcodes%2Fdocker-osx%3Asonoma](https://img.shields.io/docker/image-size/sickcodes/docker-osx/sonoma?label=sickcodes%2Fdocker-osx%3Asonoma)](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 CPU='Haswell-noTSX' \
-    -e CPUID_FLAGS='kvm=on,vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on' \
-    -e MASTER_PLIST_URL='https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-sonoma-custom.plist' \
-    sickcodes/docker-osx:sonoma
-
-# docker build -t docker-osx --build-arg SHORTNAME=sonoma .
-```
-
 #### 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
@ -153,12 +129,14 @@ docker run -it \
 ### High Sierra [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/high-sierra?label=sickcodes%2Fdocker-osx%3Ahigh-sierra](https://img.shields.io/docker/image-size/sickcodes/docker-osx/high-sierra?label=sickcodes%2Fdocker-osx%3Ahigh-sierra)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)

 ```bash
+qemu-img create -f qcow2 image.img 512G

 docker run -it \
    --device /dev/kvm \
    -p 50922:10022 \
    -v /tmp/.X11-unix:/tmp/.X11-unix \
    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    -v "${PWD}/image.img:/image" \
    sickcodes/docker-osx:high-sierra

 # docker build -t docker-osx --build-arg SHORTNAME=high-sierra .
@ -167,12 +145,14 @@ docker run -it \
 ### Mojave [![https://img.shields.io/docker/image-size/sickcodes/docker-osx/mojave?label=sickcodes%2Fdocker-osx%3Amojave](https://img.shields.io/docker/image-size/sickcodes/docker-osx/mojave?label=sickcodes%2Fdocker-osx%3Amojave)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)

 ```bash
+qemu-img create -f qcow2 image.img 512G

 docker run -it \
    --device /dev/kvm \
    -p 50922:10022 \
    -v /tmp/.X11-unix:/tmp/.X11-unix \
    -e "DISPLAY=${DISPLAY:-:0.0}" \
+    -v "${PWD}/image.img:/image" \
    sickcodes/docker-osx:mojave

 # docker build -t docker-osx --build-arg SHORTNAME=mojave .
@ -212,15 +192,12 @@ Enable SSH in network sharing inside the guest first. Change `-e "USERNAME=user"
 Since you can't see the screen, use the PLIST with nopicker, for example:

 ```bash
-# Catalina
-# wget https://images2.sick.codes/mac_hdd_ng_auto.img
-# Monterey
-wget https://images.sick.codes/mac_hdd_ng_auto_monterey.img
+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_monterey.img:/image" \
+    -v "${PWD}/mac_hdd_ng_auto.img:/image" \
    -v /tmp/.X11-unix:/tmp/.X11-unix \
    -e "DISPLAY=${DISPLAY:-:0.0}" \
    -e "USERNAME=user" \
@ -230,17 +207,6 @@ docker run -it \
    sickcodes/docker-osx:naked-auto
 ```

-# Share directories, sharing files, shared folder, mount folder
-The easiest and most secure way is `sshfs`
-```bash
-# on Linux/Windows
-mkdir ~/mnt/osx
-sshfs user@localhost:/ -p 50922 ~/mnt/osx
-# wait a few seconds, and ~/mnt/osx will have full rootfs mounted over ssh, and in userspace
-# automated: sshpass -p <password> sshfs user@localhost:/ -p 50922 ~/mnt/osx
-```
-
-
 # (VFIO) iPhone USB passthrough (VFIO)

 If you have a laptop see the next usbfluxd section.
@ -390,22 +356,18 @@ Pick one of these while **building**, irrelevant when using docker pull:
 --build-arg SHORTNAME=catalina
 --build-arg SHORTNAME=big-sur
 --build-arg SHORTNAME=monterey
--build-arg SHORTNAME=ventura
--build-arg SHORTNAME=sonoma
 ```


 ## Technical details

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

 - High Sierra
 - Mojave
 - Catalina
 - Big Sur
 - Monterey
- Ventura
- Sonoma
 - Auto (pre-made Catalina)
 - Naked (use your own .img)
 - Naked-Auto (user your own .img and SSH in)
@ -430,14 +392,6 @@ 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)

-Ventura make your own image:
-
-[![https://img.shields.io/docker/image-size/sickcodes/docker-osx/ventura?label=sickcodes%2Fdocker-osx%3Aventura](https://img.shields.io/docker/image-size/sickcodes/docker-osx/ventura?label=sickcodes%2Fdocker-osx%3Aventura)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)
-
-Sonoma make your own image:
-
-[![https://img.shields.io/docker/image-size/sickcodes/docker-osx/sonoma?label=sickcodes%2Fdocker-osx%3Asonoma](https://img.shields.io/docker/image-size/sickcodes/docker-osx/sonoma?label=sickcodes%2Fdocker-osx%3Asonoma)](https://hub.docker.com/r/sickcodes/docker-osx/tags?page=1&ordering=last_updated)
-
 Pre-made **Catalina** system by [Sick.Codes](https://sick.codes): username: `user`, password: `alpine`

 [![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)
@ -518,7 +472,7 @@ In case you're interested, contact [@sickcodes on Twitter](https://twitter.com/s

 ## License/Contributing

-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.
+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)
@ -538,7 +492,7 @@ Product names, logos, brands and other trademarks referred to within this projec

 ### Already set up or just looking to make a container quickly? Check out our [quick start](#quick-start-docker-osx) or see a bunch more use cases under our [container creation examples](#container-creation-examples) section.

-There are several different Docker-OSX images available that are suitable for different purposes.
+There are several different Docker-OSX images available which are suitable for different purposes.

 - `sickcodes/docker-osx:latest` - [I just want to try it out.](#quick-start-docker-osx)
 - `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)
@ -550,8 +504,6 @@ Create your personal image using `:latest` or `big-sur`. Then, pull the image ou
 - `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)
- `sickcodes/docker-osx:ventura` - [I want to run Ventura.](#quick-start-docker-osx)
- `sickcodes/docker-osx:sonoma` - [I want to run Sonoma.](#quick-start-docker-osx)

 - `sickcodes/docker-osx:high-sierra` - I want to run High Sierra.
 - `sickcodes/docker-osx:mojave` - I want to run Mojave.
@ -600,7 +552,7 @@ wsl --install

 If you have previously installed WSL1, upgrade to WSL 2. Check [this link to upgrade from WSL1 to WSL2](https://docs.microsoft.com/en-us/windows/wsl/install#upgrade-version-from-wsl-1-to-wsl-2).

-After WSL installation, go to `C:/Users/<Your_Name>/.wslconfig` and add `nestedVirtualization=true` to the end of the file (If the file doesn't exist, create it). For more information about the `.wslconfig` file check [this link](https://docs.microsoft.com/en-us/windows/wsl/wsl-config#wslconfig). Verify that you have selected "Show Hidden Files" and "Show File Extensions" in File Explorer options.
+After WSL installation, go to `C:/Users/<Your_Name>/.wslconfig` and add `nestedVirtualization=true` to the end of the file (If the file doesn't exist, create it). You may need to select "Show Hidden Files" and "Show File Extensions" in File Explorer options.
 The result should be like this:
 ```
 [wsl2]
@ -614,8 +566,6 @@ INFO: /dev/kvm exists
 KVM acceleration can be used
 ```

-Use the command `sudo apt -y install bridge-utils cpu-checker libvirt-clients libvirt-daemon qemu qemu-kvm` to install it if it isn't.
-
 Now download and install [Docker for Windows](https://docs.docker.com/desktop/windows/install/) if it is not already installed.

 After installation, go into Settings and check these 2 boxes:
@ -633,21 +583,13 @@ Finally, there are 3 ways to get video output:

 To use WSLg's built-in X-11 server, change these two lines in the docker run command to point Docker-OSX to WSLg.

-```
-e "DISPLAY=${DISPLAY:-:0.0}" \
-v /mnt/wslg/.X11-unix:/tmp/.X11-unix \
-```
-Or try:
-
-```
+```bash
 -e "DISPLAY=${DISPLAY:-:0}" \
 -v /mnt/wslg/.X11-unix:/tmp/.X11-unix \
 ```

-For Ubuntu 20.x on Windows, see [https://github.com/sickcodes/Docker-OSX/discussions/458](https://github.com/sickcodes/Docker-OSX/discussions/458)
-
 - VNC: See the [VNC section](#building-a-headless-container-which-allows-insecure-vnc-on-localhost-for-local-use-only) for more information. You could also add -vnc argument to qemu. Connect to your mac VM via a VNC Client. [Here is a how to](https://wiki.archlinux.org/title/QEMU#VNC)
- Desktop Environment: This will give you a full desktop linux experience but it will use a bit more of the computer's resources. Here is an example guide, but there are other guides that help set up a desktop environment. [DE Example](https://www.makeuseof.com/tag/linux-desktop-windows-subsystem/)
+- Desktop Environment: This will give you a full desktop linux experiencem but it will use a bit more of the computer's resources. Here is an example guide, but there are other guides that help set up a desktop environment. [DE Example](https://www.makeuseof.com/tag/linux-desktop-windows-subsystem/)

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

@ -706,17 +648,15 @@ Or

 #### Use more CPU Cores/SMP

-Examples:
+This will use all available cores; adjust accordingly to the day of the week:

-`-e EXTRA='-smp 6,sockets=3,cores=2'`
+```
+    -e CPU_STRING=$(nproc) \
+```

-`-e EXTRA='-smp 8,sockets=4,cores=2'`
+This will use `-smp $(nproc)`

-`-e EXTRA='-smp 16,sockets=8,cores=2'`
-
-Note, unlike memory, CPU usage is shared. so you can allocate all of your CPU's to the container.
-
-### Confirm your user is part of the Docker group, KVM group, libvirt group
+### Confirm your user is part of the the Docker group, KVM group, libvirt group

 #### Add yourself to the Docker group

@ -1068,7 +1008,7 @@ IP_ADDRESS=172.17.0.1

 ### 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 resolve this, you will need to whitelist the interface in your firewall:
+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:

 ```bash
 # Set the docker0 bridge to the trusted zone
@ -1430,7 +1370,7 @@ docker run -it \
    sickcodes/docker-osx:latest
 ```

-Here's a few other resolutions! If your resolution is invalid, it will default to 800x600.
+Here's a few other resolutions! If you resolution is invalid, it will default to 800x600.

 ```
    -e WIDTH=800 \
@ -1608,7 +1548,7 @@ Important Note: this will cause the host system to lose access to the USB device

 This is my favourite container. You can supply an existing disk image as a Docker command line argument.

- Pull images out using `sudo find /var/lib/docker -name mac_hdd_ng.img -size +10G`
+- Pull images out using `sudo find /var/lib/docker -size +10G | grep mac_hdd_ng.img`

 - Supply your own local image with the command argument `-v "${PWD}/mac_hdd_ng.img:/image"` and use `sickcodes/docker-osx:naked` when instructing Docker to create your container.

@ -1719,7 +1659,7 @@ docker run -it \
    sickcodes/docker-osx:naked
 ```

-### Building a headless container that allows insecure VNC on localhost (!for local use only!)
+### Building a headless container which allows insecure VNC on localhost (!for local use only!)

 **Must change -it to -i to be able to interact with the QEMU console**

@ -1764,7 +1704,7 @@ You also need the container IP: `docker inspect <containerid> | jq -r '.[0].Netw

 Or `ip n` will usually show the container IP first.

-Now VNC connects using the Docker container IP, for example `172.17.0.2:5999`
+Now VNC connect using the Docker container IP, for example `172.17.0.2:5999`

 Remote VNC over SSH: `ssh -N root@1.1.1.1 -L  5999:172.17.0.2:5999`, where `1.1.1.1` is your remote server IP and `172.17.0.2` is your LAN container IP.

@ -1924,3 +1864,4 @@ You may when initialising or booting into a container see errors from the `(qemu
 `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/2
+++ b/2
--- a/tests/boot-images.sh
+++ b/tests/boot-images.sh
@ -16,8 +16,6 @@
 # scrot -o catalina_master.png
 # scrot -o big-sur_master.png
 # scrot -o monterey_master.png
-# scrot -o ventura_master.png
-# scrot --overwrite --display :99 --file ~/${TEST}.png
 # pull off remote server to the tests folder
 # REMOTE_SERVER=
 # scp root@"${REMOTE_SERVER}":~/*_master.png .
@ -30,8 +28,6 @@ TESTS=(
    catalina
    big-sur
    monterey
-    ventura
-    sonoma
 )

 # test each docker image to see if they boot to their unique respective installation screens.
--- a/tests/sonoma_master.png
+++ b/tests/sonoma_master.png
--- a/tests/test.sh
+++ b/tests/test.sh
@ -119,12 +119,6 @@ MIRROR_COUNTRY="${MIRROR_COUNTRY:=US}"
 NO_CACHE="${NO_CACHE:=--no-cache}"


-TEST_BUILDS=(
-    'docker-osx:naked'
-    'docker-osx:naked-auto'
-    'docker-osx:auto'
-)
-
 TEST_BUILDS=(
    'docker-osx:naked'
    'docker-osx:naked-auto'
@ -137,30 +131,13 @@ VERSION_BUILDS=(
    'catalina'
    'big-sur'
    'monterey'
-    'ventura'
-    'sonoma'
 )

-warning () {
-    clear
-    for j in {15..1}; do 
-        echo "############# WARNING: THIS SCRIPT IS NOT INTENDED FOR USE BY ################"
-        echo "############# IT IS USED BY THE PROJECT TO BUILD AND PUSH TO DOCKERHUB #######"
-        echo ""
-        echo "                     Press Ctrl C to stop.       "
-        MAX_COLS=$((${COLUMNS}/2))
-        printf "$j %.0s" {1..20}
-        echo
-        sleep 1
-    done
-}
-
 install_docker () {
    apt remove docker docker-engine docker.io containerd runc -y \
    ; apt install apt-transport-https ca-certificates curl gnupg-agent software-properties-common -y \
    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg |  apt-key add - \
    && apt-key fingerprint 0EBFCD88 \
-    && > /etc/apt/sources.list.d/docker.list \
    && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
    && apt update -y \
    && apt install docker-ce docker-ce-cli containerd.io -y \
@ -293,7 +270,6 @@ EOF
    systemctl enable --now docker
 }

-warning
 tee -a ~/.bashrc <<EOF
 export DEBIAN_FRONTEND=noninteractive
 export TZ=UTC
@ -309,15 +285,13 @@ yes | apt install -y --no-install-recommends tzdata -y
 install_scrotcat
 yes | install_vnc
 export_display_99
-apt install xvfb -y
 start_xvfb
 # start_vnc
 enable_kvm
 reset_docker_hard
-# echo killall Xvfb
+echo killall Xvfb
 clone_repo "${BRANCH}" "${REPO}"
 cd ./Docker-OSX
-git pull

 for SHORTNAME in "${VERSION_BUILDS[@]}"; do
    docker-osx:version "${SHORTNAME}"
@ -338,10 +312,6 @@ if [[ "${DOCKER_USERNAME}" ]] && [[ "${DOCKER_PASSWORD}" ]]; then
            docker push "sickcodes/docker-osx:${SHORTNAME}"
        done \
        && touch PUSHED
-    docker push sickcodes/docker-osx:naked
-    docker push sickcodes/docker-osx:auto
-    docker push sickcodes/docker-osx:naked-auto
-
 fi

 # connect remotely to your server to use VNC
--- a/tests/ventura_master.png
+++ b/tests/ventura_master.png
--- a/vnc-version/Dockerfile
+++ b/vnc-version/Dockerfile
@ -93,13 +93,10 @@ RUN if [[ "${RANKMIRRORS}" ]]; then { pacman -Sy wget --noconfirm || pacman -Syu
    && tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \
    && cat /etc/pacman.d/mirrorlist ; fi

-# Fixes issue with invalid GPG keys: update the archlinux-keyring package to get the latest keys, then remove and regenerate gnupg keys
-RUN pacman -Sy archlinux-keyring --noconfirm && rm -rf /etc/pacman.d/gnupg && pacman-key --init && pacman-key --populate
-
 USER arch

-RUN yes | sudo pacman -Syyuu --noconfirm \
-    && yes | sudo pacman -S tigervnc xterm xorg-xhost xdotool ufw --noconfirm \
+RUN sudo pacman -Syyuu --noconfirm \
+    && sudo pacman -S tigervnc xterm xorg-xhost xdotool ufw --noconfirm \
    && mkdir -p ${HOME}/.vnc \
    && touch ~/.vnc/config \
    && tee -a ~/.vnc/config <<< 'geometry=1920x1080' \
--- a/vnc-version/Dockerfile.nakedvnc
+++ b/vnc-version/Dockerfile.nakedvnc
@ -57,6 +57,12 @@ RUN if [[ "${RANKMIRRORS}" ]]; then { pacman -Sy wget --noconfirm || pacman -Syu
    && tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \
    && cat /etc/pacman.d/mirrorlist ; fi

+# 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
+
 # For taking screenshots of the Xfvb screen, useful during development.
 ARG SCROT

@ -77,6 +83,12 @@ 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
+
 USER arch

 WORKDIR /home/arch/OSX-KVM
@ -180,14 +192,21 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}"  2>/dev/

 WORKDIR /home/arch/OSX-KVM

-RUN yes | sudo pacman -Syyuu --noconfirm \
-    && yes | sudo pacman -S tigervnc xterm xorg-xhost xdotool ufw --noconfirm \
+RUN sudo pacman -Syyuu --noconfirm \
+    && sudo pacman -S tigervnc xterm xorg-xhost xdotool ufw --noconfirm \
    && mkdir -p ${HOME}/.vnc \
    && touch ~/.vnc/config \
    && tee -a ~/.vnc/config <<< 'geometry=1920x1080' \
    && 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	235917cf84	Move `/home/arch/OSX-KVM` to `/home/arch/Docker-OSX/OSX-KVM`, but symlink it anyway	2022-02-24 00:45:19 +00:00
sickcodes	92d61de642	If you put an image at /imamge, the image will use that at runtime. Move OSX-KVM to submodule, and symlink for perfect redundancy `ln -s /home/arch/Docker-OSX/OSX-KVM /home/arch/OSX-KVM`	2022-02-24 00:41:55 +00:00