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

4
Dockerfile.auto
View file

@ -131,6 +131,10 @@ ENV DISPLAY=:99
ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img 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 NOPICKER=true
ENV TERMS_OF_USE=i_agree ENV TERMS_OF_USE=i_agree

6
Dockerfile.naked
View file

@ -101,12 +101,16 @@ RUN mkdir -p ~/.ssh \
&& tee -a ~/.ssh/config <<< ' StrictHostKeyChecking no' \ && tee -a ~/.ssh/config <<< ' StrictHostKeyChecking no' \
&& tee -a ~/.ssh/config <<< ' UserKnownHostsFile=/dev/null' && tee -a ~/.ssh/config <<< ' UserKnownHostsFile=/dev/null'
ENV NOPICKER=true ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2
ENV DISPLAY=:99 ENV DISPLAY=:99
ENV ENV=/env
ENV IMAGE_PATH=/image ENV IMAGE_PATH=/image
ENV NOPICKER=true
CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null || true \ CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null || true \
; [[ "${DISPLAY}" = ':99' ]] && { \ ; [[ "${DISPLAY}" = ':99' ]] && { \
nohup Xvfb :99 -screen 0 1920x1080x16 \ nohup Xvfb :99 -screen 0 1920x1080x16 \