From f03278da1b8665f1baa5289c009b94bae95ae79d Mon Sep 17 00:00:00 2001 From: sickcodes Date: Fri, 13 Nov 2020 08:34:40 +0000 Subject: [PATCH] Fixed Dockerfile instructions to align with the README instructions. --- CREDITS.md | 2 ++ Dockerfile | 8 ++------ vnc-version/Dockerfile | 8 +------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index 9a4a178..ff68a73 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -32,3 +32,5 @@ These credits refer to the contributors to this repository: [@mikob](https://github.com/mikob) - Added important warning for Xcode users to reserve 60GB++ - Made instructions more clear for those needing Xcode #94 +[@AdamMomen](https://github.com/AdamMomen) - Fixed automatic boot vnc-version container instructions for better usablility + diff --git a/Dockerfile b/Dockerfile index 6ffcb31..6e6b713 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,13 +26,13 @@ # # Basic Run: # -# docker run --privileged -e "DISPLAY=${DISPLAY:-:0.0}" -v /tmp/.X11-unix:/tmp/.X11-unix docker-osx +# docker run --device /dev/kvm --device /dev/snd -v /tmp/.X11-unix:/tmp/.X11-unix -e "DISPLAY=${DISPLAY:-:0.0}" sickcodes/docker-osx:latest # # # Run with SSH: # # -# docker run -e RAM=6 --privileged -p 50922:10022 -e "DISPLAY=${DISPLAY:-:0.0}" -v /tmp/.X11-unix:/tmp/.X11-unix docker-osx:latest +# docker run --device /dev/kvm --device /dev/snd -e RAM=6 -p 50922:10022 -v /tmp/.X11-unix:/tmp/.X11-unix -e "DISPLAY=${DISPLAY:-:0.0}" sickcodes/docker-osx:latest # # ssh fullname@localhost -p 50922 # # Optargs: @@ -50,10 +50,6 @@ # docker run ... -e EXTRA="-usb -device usb-host,hostbus=1,hostaddr=8" ... # # you will also need to pass the device to the container # -# -# Other permissions: -# -# docker run --privileged --net host -e "DISPLAY=${DISPLAY:-:0.0}" -e RAM=6 --cap-add=ALL -v /tmp/.X11-unix:/tmp/.X11-unix -v /dev:/dev -v /lib/modules:/lib/modules -v /var/run/libvirt/libvirt-sock:/var/run/libvirt/libvirt-sock docker-osx:latest FROM archlinux:latest diff --git a/vnc-version/Dockerfile b/vnc-version/Dockerfile index 606a830..0b3fe0f 100644 --- a/vnc-version/Dockerfile +++ b/vnc-version/Dockerfile @@ -26,7 +26,7 @@ # # Run: # -# docker run -p 8888:5999 -p 50922:10022 -d --privileged docker-osx-vnc:latest +# docker run --device /dev/kvm --device /dev/snd -p 8888:5999 -p 50922:10022 -d --privileged docker-osx-vnc:latest # # # Connect locally (safe): @@ -62,12 +62,6 @@ # docker ps # # copy container ID and then # docker exec abc123fgh456 tail vncpasswd_file -# -# -# Optional: -# -# You can set VNC color depth with -e DEPTH=24, it's not pretty though. -# # # VNC Version # Let's piggyback the other image: