aboutsummaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorsickcodes <[email protected]>2021-02-25 18:16:24 +0000
committersickcodes <[email protected]>2021-02-25 18:16:24 +0000
commitc5aab3020d28c344912e0719f0c4b9059361d633 (patch)
treeab06026af070f6b2fed4d3064d4d3c8616e1e005 /Dockerfile
parentEarly chown required for all volumes... (diff)
downloaddocker-osx-c5aab3020d28c344912e0719f0c4b9059361d633.tar.xz
docker-osx-c5aab3020d28c344912e0719f0c4b9059361d633.zip
Set defaults in obvious places
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index ae3cceb..5b2080c 100644
--- a/Dockerfile
+++ b/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 \
;; \