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.auto | |
| 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.auto')
| -rw-r--r-- | Dockerfile.auto | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/Dockerfile.auto b/Dockerfile.auto index 4b186f4..90bb432 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -133,6 +133,8 @@ ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2 ENV DISPLAY=:99 +ENV HEADLESS=false + ENV ENV=/env ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img @@ -175,21 +177,10 @@ CMD echo "${BOILERPLATE}" \ --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 \ - ; [[ "${DISPLAY}" = ':99' ]] && { \ + ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \ nohup Xvfb :99 -screen 0 1920x1080x16 \ - & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 0.1 ; done \ + & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \ ; } \ - ; echo "Checking whether /image is a directory or a QEMU disk." \ - ; case "$(file --brief /image)" in \ - QEMU*) export IMAGE_PATH=/image;; \ - directory*) export IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img;; \ - esac \ ; stat "${IMAGE_PATH}" \ ; echo "Large image is being copied between layers, please wait a minute..." \ ; ./enable-ssh.sh \ |