xstefen/Docker-OSX
1
0
Fork 0
mirror of https://github.com/sickcodes/Docker-OSX.git synced 2025-07-01 18:32:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set defaults in obvious places

Browse Source
This commit is contained in:
sickcodes
2021-02-25 18:16:24 +00:00
parent 284fe9fbde
commit c5aab3020d
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -227,8 +227,12 @@ USER arch
ENV USER arch
ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2
ENV DISPLAY=:0.0
ENV ENV=/env
ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
ENV NETWORKING=e1000-82545em
@ -236,8 +240,8 @@ ENV NETWORKING=e1000-82545em
ENV NOPICKER=false
# Boolean for generating a bootdisk with new serials.
ENV UNIQUE=false
# Boolean for generating a bootdisk with new serials.
VOLUME ["/tmp/.X11-unix"]
@ -273,8 +277,8 @@ CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null |
--count 1 \
--tsv ./serial.tsv \
--bootdisks \
--output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
--output-env "${ENV:=/env}" \
--output-bootdisk "${BOOTDISK}" \
--output-env "${ENV}" \
&& source "${ENV}" \
; [[ "${GENERATE_SPECIFIC}" == true ]] \
&& source /env \
@ -284,7 +288,7 @@ CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null |
--board-serial "${BOARD_SERIAL}" \
--uuid "${UUID}" \
--mac-address "${MAC_ADDRESS}" \
--output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
--output-bootdisk "${BOOTDISK}" \
; case "$(file --brief /bootdisk)" in \
QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \
;; \