xstefen/Docker-OSX
1
0
Fork 0
mirror of https://github.com/sickcodes/Docker-OSX.git synced 2024-12-22 05:51:32 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #228 from sickcodes/qemu-interactive

Browse Source 
Remove envsubst to allow interactive QEMU using -i
This commit is contained in:
sickcodes 2021-03-28 11:02:11 +00:00 committed by GitHub
commit ba28790c13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.auto
View File

@ -219,7 +219,7 @@ CMD echo "${BOILERPLATE}" \
/usr/bin/ssh-keygen -t rsa -f ~/.ssh/id_docker_osx -q -N "" \ /usr/bin/ssh-keygen -t rsa -f ~/.ssh/id_docker_osx -q -N "" \
&& chmod 600 ~/.ssh/id_docker_osx \ && chmod 600 ~/.ssh/id_docker_osx \
; } \ ; } \
; envsubst < ./Launch.sh | bash \ ; /bin/bash -c ./Launch.sh \
& echo "Booting Docker-OSX in the background. Please wait..." \ & echo "Booting Docker-OSX in the background. Please wait..." \
; until [[ "$(sshpass -palpine ssh-copy-id -f -i ~/.ssh/id_docker_osx.pub -p 10022 user@127.0.0.1)" ]]; do \ ; until [[ "$(sshpass -palpine ssh-copy-id -f -i ~/.ssh/id_docker_osx.pub -p 10022 user@127.0.0.1)" ]]; do \
echo "Disk is being copied between layers. Repeating until able to copy SSH key into OSX..." \ echo "Disk is being copied between layers. Repeating until able to copy SSH key into OSX..." \

2
Dockerfile.naked
View File

@ -177,4 +177,4 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true
--height "${HEIGHT:-1080}" \ --height "${HEIGHT:-1080}" \
--output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \ --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