aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsickcodes <[email protected]>2021-02-08 22:21:44 +0000
committerGitHub <[email protected]>2021-02-08 22:21:44 +0000
commitcf391bbf90bc2417e2d44351dc0d4d3358731a44 (patch)
tree3d14f98b040fd9c8d402ab142755a138cad7a619
parentReduced image by 5GB, thanks to @weskerfoot! (diff)
parentAdd a default shell variable for the nic. (diff)
downloaddocker-osx-cf391bbf90bc2417e2d44351dc0d4d3358731a44.tar.xz
docker-osx-cf391bbf90bc2417e2d44351dc0d4d3358731a44.zip
Merge pull request #147 from sickcodes/vmxnet3
Add -e NETWORKING=e1000-82545em || -e NETWORKING=vmxnet3 as runtime arguments.
-rw-r--r--Dockerfile6
-rw-r--r--README.md1
2 files changed, 6 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index fb1f86a..c13255b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -178,7 +178,8 @@ RUN touch Launch.sh \
&& tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=qcow2 \' \
&& tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=${IMAGE_PATH:-/home/arch/OSX-KVM/mac_hdd_ng.img},format=qcow2 \' \
&& tee -a Launch.sh <<< '-device ide-hd,bus=sata.4,drive=MacHDD \' \
- && tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900, -device e1000-82545em,netdev=net0,id=net0,mac=${MAC_ADDRESS:-52:54:00:09:49:17} \' \
+ && tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900, \' \
+ && tee -a Launch.sh <<< '-device ${NETWORKING:-e1000-82545em},netdev=net0,id=net0,mac=${MAC_ADDRESS:-52:54:00:09:49:17} \' \
&& tee -a Launch.sh <<< '-monitor stdio \' \
&& tee -a Launch.sh <<< '-vga vmware \' \
&& tee -a Launch.sh <<< '${EXTRA:-}'
@@ -196,6 +197,9 @@ ENV DISPLAY=:0.0
ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
+ENV NETWORKING=e1000-82545em
+# ENV NETWORKING=vmxnet3
+
VOLUME ["/tmp/.X11-unix"]
CMD case "$(file --brief /image)" in \
diff --git a/README.md b/README.md
index 76bab68..79909d6 100644
--- a/README.md
+++ b/README.md
@@ -622,6 +622,7 @@ docker run \
-e IMAGE_PATH=/image \
-e SCREEN_SHARE_PORT=5900 \
-e DISPLAY=:0 \
+ -e NETWORKING=vmxnet3 \
--device /dev/kvm \
--device /dev/snd \
-v /tmp/.X11-unix:/tmp/.X11-unix \