diff options
| author | sickcodes <[email protected]> | 2021-02-27 11:44:40 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-02-27 11:44:40 +0000 |
| commit | fd80032eab4ccc0fe92467bd19d0a43fbcd4a7db (patch) | |
| tree | ebce2f895eb848018178ac6e2125714d22d6e4e2 | |
| parent | Merge pull request #157 from sickcodes/helm-updates (diff) | |
| parent | Add bigsur BaseSystem.img support. Use `--build-arg VERSION=11` or higher. Do... (diff) | |
| download | docker-osx-fd80032eab4ccc0fe92467bd19d0a43fbcd4a7db.tar.xz docker-osx-fd80032eab4ccc0fe92467bd19d0a43fbcd4a7db.zip | |
Merge pull request #158 from sickcodes/bigsur
Add bigsur BaseSystem.img support. Use `--build-arg VERSION=11`
| -rw-r--r-- | Dockerfile | 23 |
1 files changed, 18 insertions, 5 deletions
@@ -150,7 +150,7 @@ RUN touch enable-ssh.sh \ # RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils edk2-ovmf netctl libvirt-dbus --overwrite --noconfirm -RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils openresolv jack ebtables edk2-ovmf netctl libvirt-dbus --overwrite --noconfirm \ +RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils openresolv jack ebtables edk2-ovmf netctl libvirt-dbus wget --overwrite --noconfirm \ && yes | sudo pacman -Scc # TEMP-FIX for pacman issue @@ -164,10 +164,23 @@ RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \ WORKDIR /home/arch/OSX-KVM -RUN python fetch-macOS.py --version "${VERSION}" \ - && qemu-img convert BaseSystem.dmg -O qcow2 -p -c BaseSystem.img \ - && qemu-img create -f qcow2 mac_hdd_ng.img "${SIZE}" \ - && rm -f BaseSystem.dmg +RUN [[ "${VERSION%%.*}" -lt 11 ]] && { python fetch-macOS.py --version "${VERSION}" \ + && qemu-img convert BaseSystem.dmg -O qcow2 -p -c BaseSystem.img \ + && qemu-img create -f qcow2 mac_hdd_ng.img "${SIZE}" \ + && rm -f BaseSystem.dmg \ + ; } || true + +# VERSION=11.2.1 +# this downloads LATEST ONLY +ARG FETCH_MAC_OS_RAW=https://raw.githubusercontent.com/acidanthera/OpenCorePkg/master/Utilities/macrecovery/macrecovery.py +# submit a PR to here to get the version option https://github.com/acidanthera/OpenCorePkg/blob/master/Utilities/macrecovery/macrecovery.py + +RUN [[ "${VERSION%%.*}" -ge 11 ]] && { wget "${FETCH_MAC_OS_RAW}" \ + && python macrecovery.py download \ + && qemu-img convert BaseSystem.dmg -O qcow2 -p -c BaseSystem.img \ + && qemu-img create -f qcow2 mac_hdd_ng.img "${SIZE}" \ + && rm -f BaseSystem.dmg \ + ; } || true # > Launch.sh # > Docker-OSX.xml |