From 8dc03683e1503909c6de1bc2668052da1e0b9066 Mon Sep 17 00:00:00 2001 From: KimJammer <41841812+kimjammer@users.noreply.github.com> Date: Sun, 28 Nov 2021 21:42:37 -0500 Subject: [PATCH 1/5] readme - Instructions to use WSLg's built-in X11 server Add instructions for using correct DISPLAY value and X-11 socket mount point to use WSLg's built-in X11 server on Windows 11. --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b17614..00be8d8 100644 --- a/README.md +++ b/README.md @@ -1184,9 +1184,16 @@ Running Docker-OSX on windows is possible just in WSL2 (Windows, Ubuntu). Ensure KVM is enabled and `x11-apps` is installed. -to void troubles related to docker daemons on WLS 2, use Docker on Windows, and extern it to your distro. +To void troubles related to docker daemons on WLS 2, use Docker on Windows, and extern it to your distro. See Docker Docs for the complete detail setup [here](https://docs.docker.com/docker-for-windows/wsl/) +#### Using WSLg + +To use WSLg's built in X11 server, change these two lines to point Docker-OSX to it. + +`-e "DISPLAY=${DISPLAY:-:0}" \` +`-v /mnt/wslg/.X11-unix:/tmp/.X11-unix \` + See more in-depth discussion [here](https://github.com/sickcodes/Docker-OSX/issues/17) and [here](https://github.com/sickcodes/Docker-OSX/issues/60). From 8ae71a36d12fb4dcdfe32b56c85460e178066f27 Mon Sep 17 00:00:00 2001 From: KimJammer <41841812+kimjammer@users.noreply.github.com> Date: Mon, 29 Nov 2021 16:58:23 -0500 Subject: [PATCH 2/5] readme - update windows information --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 00be8d8..e1e3785 100644 --- a/README.md +++ b/README.md @@ -1182,7 +1182,7 @@ Or tell the container to use specific ones using `-e GENERATE_SPECIFIC=true` Running Docker-OSX on windows is possible just in WSL2 (Windows, Ubuntu). -Ensure KVM is enabled and `x11-apps` is installed. +Ensure KVM is enabled (Windows 11 required) and `x11-apps` is installed. To void troubles related to docker daemons on WLS 2, use Docker on Windows, and extern it to your distro. See Docker Docs for the complete detail setup [here](https://docs.docker.com/docker-for-windows/wsl/) @@ -1191,10 +1191,13 @@ See Docker Docs for the complete detail setup [here](https://docs.docker.com/doc To use WSLg's built in X11 server, change these two lines to point Docker-OSX to it. -`-e "DISPLAY=${DISPLAY:-:0}" \` -`-v /mnt/wslg/.X11-unix:/tmp/.X11-unix \` +```bash +-e "DISPLAY=${DISPLAY:-:0}" \ +-v /mnt/wslg/.X11-unix:/tmp/.X11-unix \ +``` + -See more in-depth discussion [here](https://github.com/sickcodes/Docker-OSX/issues/17) and [here](https://github.com/sickcodes/Docker-OSX/issues/60). +See more in-depth discussion about Docker-OSX on Windows [here](https://github.com/sickcodes/Docker-OSX/issues/17) and [here](https://github.com/sickcodes/Docker-OSX/issues/60). ### Changing display resolution From be0c44928fb4f1b1fd3f150a62052835935b2e3c Mon Sep 17 00:00:00 2001 From: KimJammer <41841812+kimjammer@users.noreply.github.com> Date: Mon, 29 Nov 2021 17:44:07 -0500 Subject: [PATCH 3/5] Update CREDITS.md --- CREDITS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CREDITS.md b/CREDITS.md index 025ed7c..e2d4a27 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -97,3 +97,5 @@ This project now uses the fantastic OpenCore bootloader from the community OpenC [@Buthrakaur](https://github.com/Buthrakaur) readme - improve instructions for running on windows #361 [@eggplants](https://github.com/eggplants) Fix command to launch sickcodes/docker-osx:auto #366 + +[@kimjammer](https://github.com/kimjammer) Readme - Added instructions for using WSLg's built in X11 server #395 From c6c6c6985147d3b1e895a9ddc0be9deffa1c1959 Mon Sep 17 00:00:00 2001 From: sickcodes <65906298+sickcodes@users.noreply.github.com> Date: Mon, 29 Nov 2021 22:52:06 +0000 Subject: [PATCH 4/5] Update README.md Move to top --- README.md | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index e1e3785..c438599 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ Run Mac OS X in Docker with near-native performance! X11 Forwarding! iMessage security research! iPhone USB working! macOS in a Docker container! +Conduct Security Research on macOS using both Linux & Windows! + # Docker-OSX now has a Discord server & Telegram! The Discord is active on #docker-osx and anyone is welcome to come and ask questions, ideas, etc. @@ -475,6 +477,30 @@ echo 1 | sudo tee /sys/module/kvm/parameters/ignore_msrs sudo modprobe kvm ``` +### I'd like to run Docker-OSX on Windows + +Running Docker-OSX on Windows is now possible using WSL2 (Windows + Ubuntu Subsystem!). + +Ensure KVM is enabled (Windows 11 is required) and `x11-apps` is installed. + +First, setup [Docker for Windows following the official Docker guide](https://docs.docker.com/desktop/windows/wsl/#download). + +You need the official Docker Desktop exe: [https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe). + +#### Using WSLg (WSL GUI which includes Wayland or X applications to run) + +[https://github.com/microsoft/wslg[(https://github.com/microsoft/wslg) + +To use WSLg's built in X11 server, change these two lines to point Docker-OSX to it. + +```bash + -e "DISPLAY=${DISPLAY:-:0}" \ + -v /mnt/wslg/.X11-unix:/tmp/.X11-unix \ +``` + +See more in-depth discussion about Docker-OSX on Windows [here](https://github.com/sickcodes/Docker-OSX/issues/17) and [here](https://github.com/sickcodes/Docker-OSX/issues/60). + + ## Additional boot instructions for when you are [creating your container](#container-creation-examples) - Boot the macOS Base System (Press Enter) @@ -1178,28 +1204,6 @@ Or tell the container to use specific ones using `-e GENERATE_SPECIFIC=true` -e MAC_ADDRESS="A8:5C:2C:9A:46:2F" \ ``` -### I'd like to run Docker-OSX on Windows - -Running Docker-OSX on windows is possible just in WSL2 (Windows, Ubuntu). - -Ensure KVM is enabled (Windows 11 required) and `x11-apps` is installed. - -To void troubles related to docker daemons on WLS 2, use Docker on Windows, and extern it to your distro. -See Docker Docs for the complete detail setup [here](https://docs.docker.com/docker-for-windows/wsl/) - -#### Using WSLg - -To use WSLg's built in X11 server, change these two lines to point Docker-OSX to it. - -```bash --e "DISPLAY=${DISPLAY:-:0}" \ --v /mnt/wslg/.X11-unix:/tmp/.X11-unix \ -``` - - -See more in-depth discussion about Docker-OSX on Windows [here](https://github.com/sickcodes/Docker-OSX/issues/17) and [here](https://github.com/sickcodes/Docker-OSX/issues/60). - - ### Changing display resolution The display resolution is controlled by this line: From d028bd341b8cf0061c0ffaee7b6b3352b3694a45 Mon Sep 17 00:00:00 2001 From: sickcodes <65906298+sickcodes@users.noreply.github.com> Date: Mon, 29 Nov 2021 22:55:29 +0000 Subject: [PATCH 5/5] Add Windows Instructions Link at the tippity top. Add Windows Instructions Link at the tippity top. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c438599..2c99a9f 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,6 @@ The Discord is active on #docker-osx and anyone is welcome to come and ask quest

- - ### Click to join the Discord server [https://discord.gg/sickchat](https://discord.gg/sickchat) ### Click to join the Telegram server [https://t.me/sickcodeschat](https://t.me/sickcodeschat) @@ -45,6 +43,8 @@ If you like this project, consider contributing here or upstream! Video setup tutorial is also available here: https://www.youtube.com/watch?v=wLezYl77Ll8 +**Windows users:** [click here to see the notes below](https://github.com/kimjammer/Docker-OSX/tree/patch-1#id-like-to-run-docker-osx-on-windows)! +

@@ -489,7 +489,7 @@ You need the official Docker Desktop exe: [https://desktop.docker.com/win/main/a #### Using WSLg (WSL GUI which includes Wayland or X applications to run) -[https://github.com/microsoft/wslg[(https://github.com/microsoft/wslg) +[https://github.com/microsoft/wslg](https://github.com/microsoft/wslg) To use WSLg's built in X11 server, change these two lines to point Docker-OSX to it.