diff options
| author | sickcodes <[email protected]> | 2021-03-24 21:16:03 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-03-24 21:16:03 +0000 |
| commit | 2414f466d0c6fd142734630c8206137695233575 (patch) | |
| tree | 95b72f1fa86c26c2299d73d6918d2f1500de381d /Dockerfile | |
| parent | Merge pull request #221 from sickcodes/kvmless (diff) | |
| download | docker-osx-2414f466d0c6fd142734630c8206137695233575.tar.xz docker-osx-2414f466d0c6fd142734630c8206137695233575.zip | |
Enable interactive QEMU. Remove envsubst since we are already using bash. Add -x flag
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -7,7 +7,7 @@ # # Title: Docker-OSX (Mac on Docker) # Author: Sick.Codes https://twitter.com/sickcodes -# Version: 4.2 +# Version: 4.3 # License: GPLv3+ # Repository: https://github.com/sickcodes/Docker-OSX # Website: https://sick.codes @@ -205,8 +205,8 @@ RUN git clone --recurse-submodules --depth 1 --branch "${BRANCH}" "${REPO}" RUN touch Launch.sh \ && chmod +x ./Launch.sh \ - && tee -a Launch.sh <<< '#!/bin/sh' \ - && tee -a Launch.sh <<< 'set -eu' \ + && tee -a Launch.sh <<< '#!/bin/bash' \ + && tee -a Launch.sh <<< 'set -eux' \ && tee -a Launch.sh <<< 'sudo chown $(id -u):$(id -g) /dev/kvm 2>/dev/null || true' \ && tee -a Launch.sh <<< 'sudo chown -R $(id -u):$(id -g) /dev/snd 2>/dev/null || true' \ && tee -a Launch.sh <<< '[[ "${RAM}" = max ]] && export RAM="$(("$(head -n1 /proc/meminfo | tr -dc "[:digit:]") / 1000000"))"' \ @@ -340,7 +340,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}" \ ; } \ - ; ./enable-ssh.sh && envsubst < ./Launch.sh | bash + ; ./enable-ssh.sh && ./Launch.sh # virt-manager mode: eta son # CMD virsh define <(envsubst < Docker-OSX.xml) && virt-manager || virt-manager |