diff options
| author | sickcodes <[email protected]> | 2021-03-06 17:59:03 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-03-06 17:59:03 +0000 |
| commit | 7d6e5b30d872a3e8fdc65099ed691dadabc46220 (patch) | |
| tree | 654c263bc28d730c5cb9e0290bba9cbde6103fad /Dockerfile.naked | |
| parent | Fix bootdisk not getting written to persistent file when using NOPICKER=true.... (diff) | |
| download | docker-osx-7d6e5b30d872a3e8fdc65099ed691dadabc46220.tar.xz docker-osx-7d6e5b30d872a3e8fdc65099ed691dadabc46220.zip | |
Remove useless case statements. Allow -e HEADLESS=true as human readable alternative to -e DISPLAY=:99.
Diffstat (limited to 'Dockerfile.naked')
| -rw-r--r-- | Dockerfile.naked | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Dockerfile.naked b/Dockerfile.naked index 28290a4..f002781 100644 --- a/Dockerfile.naked +++ b/Dockerfile.naked @@ -106,6 +106,8 @@ ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2 ENV DISPLAY=:99 +ENV HEADLESS=false + ENV ENV=/env ENV IMAGE_PATH=/image @@ -113,7 +115,7 @@ ENV IMAGE_PATH=/image ENV NOPICKER=true CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \ - ; [[ "${DISPLAY}" = ':99' ]] && { \ + ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \ nohup Xvfb :99 -screen 0 1920x1080x16 \ & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \ ; } \ @@ -145,10 +147,4 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS --height "${HEIGHT:-1080}" \ --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \ ; } \ - ; case "$(file --brief /bootdisk)" in \ - QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \ - ;; \ - directory* ) export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2 \ - ;; \ - esac \ ; ./enable-ssh.sh && envsubst < ./Launch.sh | bash |