aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsickcodes <[email protected]>2021-03-28 10:17:47 +0000
committersickcodes <[email protected]>2021-03-28 10:17:47 +0000
commit6243c33e47039920dbcd11727aff2cb50096d9a8 (patch)
tree7086bf22843a036255563df64fdd058970c08dc2
parentAdd shields with live image sizes (diff)
downloaddocker-osx-6243c33e47039920dbcd11727aff2cb50096d9a8.tar.xz
docker-osx-6243c33e47039920dbcd11727aff2cb50096d9a8.zip
Remove envsubst to allow interactive QEMU using -i
-rw-r--r--Dockerfile.auto2
-rw-r--r--Dockerfile.naked2
2 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile.auto b/Dockerfile.auto
index 8175e3e..170029f 100644
--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@@ -219,7 +219,7 @@ CMD echo "${BOILERPLATE}" \
/usr/bin/ssh-keygen -t rsa -f ~/.ssh/id_docker_osx -q -N "" \
&& chmod 600 ~/.ssh/id_docker_osx \
; } \
- ; envsubst < ./Launch.sh | bash \
+ ; /bin/bash -c ./Launch.sh \
& echo "Booting Docker-OSX in the background. Please wait..." \
; until [[ "$(sshpass -palpine ssh-copy-id -f -i ~/.ssh/id_docker_osx.pub -p 10022 [email protected])" ]]; do \
echo "Disk is being copied between layers. Repeating until able to copy SSH key into OSX..." \
diff --git a/Dockerfile.naked b/Dockerfile.naked
index 6a5e397..16de510 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -177,4 +177,4 @@ 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 && /bin/bash -c ./Launch.sh