mirror of
https://github.com/sickcodes/Docker-OSX.git
synced 2024-12-21 21:41:31 -06:00
Set defaults in obvious places
This commit is contained in:
parent
284fe9fbde
commit
c5aab3020d
12
Dockerfile
12
Dockerfile
@ -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 \
|
||||
;; \
|
||||
|
@ -131,6 +131,10 @@ ENV DISPLAY=:99
|
||||
|
||||
ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
|
||||
|
||||
ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2
|
||||
|
||||
ENV ENV=/env
|
||||
|
||||
ENV NOPICKER=true
|
||||
|
||||
ENV TERMS_OF_USE=i_agree
|
||||
|
@ -101,12 +101,16 @@ RUN mkdir -p ~/.ssh \
|
||||
&& tee -a ~/.ssh/config <<< ' StrictHostKeyChecking no' \
|
||||
&& tee -a ~/.ssh/config <<< ' UserKnownHostsFile=/dev/null'
|
||||
|
||||
ENV NOPICKER=true
|
||||
ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2
|
||||
|
||||
ENV DISPLAY=:99
|
||||
|
||||
ENV ENV=/env
|
||||
|
||||
ENV IMAGE_PATH=/image
|
||||
|
||||
ENV NOPICKER=true
|
||||
|
||||
CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null || true \
|
||||
; [[ "${DISPLAY}" = ':99' ]] && { \
|
||||
nohup Xvfb :99 -screen 0 1920x1080x16 \
|
||||
|
Loading…
Reference in New Issue
Block a user