diff options
| author | sickcodes <[email protected]> | 2021-05-06 05:29:26 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-05-06 05:29:26 +0000 |
| commit | 84e1682700a9dbebfb254d2b8deb9c1f0ef2a345 (patch) | |
| tree | b7daf80a6c6839d1badf31902cbb970544e204b0 /vnc-version | |
| parent | Update README.md with Big Sur 11.3 Fixes (diff) | |
| download | docker-osx-84e1682700a9dbebfb254d2b8deb9c1f0ef2a345.tar.xz docker-osx-84e1682700a9dbebfb254d2b8deb9c1f0ef2a345.zip | |
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`
Diffstat (limited to 'vnc-version')
| -rw-r--r-- | vnc-version/Dockerfile.nakedvnc | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/vnc-version/Dockerfile.nakedvnc b/vnc-version/Dockerfile.nakedvnc index 9203e58..9d2e491 100644 --- a/vnc-version/Dockerfile.nakedvnc +++ b/vnc-version/Dockerfile.nakedvnc @@ -3,11 +3,11 @@ # / __ \____ _____/ /_____ _____/ __ \/ ___/ |/ / # / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \| / # / /_/ / /_/ / /__/ ,< / __/ / / /_/ /___/ / | -# /_____/\____/\___/_/|_|\___/_/ \____//____/_/|_| :NAKED +# /_____/\____/\___/_/|_|\___/_/ \____//____/_/|_| :NAKEDVNC # # Title: Docker-OSX (Mac on Docker) # Author: Sick.Codes https://twitter.com/sickcodes -# Version: 4.3 +# Version: 4.4 # License: GPLv3+ # Repository: https://github.com/sickcodes/Docker-OSX # Website: https://sick.codes @@ -19,15 +19,15 @@ # # Build: # -# docker build -t docker-osx:naked -f Dockerfile.naked . +# docker build -t docker-osx:nakedvnc -f Dockerfile.nakedvnc . # # Run headless: # -# docker run -it --device /dev/kvm -p 50922:10022 -v ${PWD}/mac_hdd_ng.img:/image docker-osx:naked +# docker run -it --device /dev/kvm -p 50922:10022 -v ${PWD}/mac_hdd_ng.img:/image docker-osx:nakedvnc # # 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:naked +# 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 # FROM sickcodes/docker-osx:latest @@ -106,8 +106,14 @@ 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 @@ -142,8 +148,12 @@ ENV RAM=8 ENV WIDTH=1920 ENV HEIGHT=1080 -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 \ +# 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 \ ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \ nohup Xvfb :99 -screen 0 1920x1080x16 \ & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \ @@ -163,7 +173,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true --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 \ @@ -176,7 +186,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true --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 @@ -189,6 +199,13 @@ 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' \ |