From 3b1a8431dbfa7ca0e3415dc451737b5695b6b05d Mon Sep 17 00:00:00 2001
From: Ben Mitchell <realmrbenftw@gmail.com>
Date: Sun, 23 Aug 2020 20:39:47 +0100
Subject: [PATCH 1/3] Update macOS + add Screen Sharing

Update macOS Catalina to the latest version by default and enable port forwarding for screen share
---
 Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f59191f..ca21837 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,7 +38,7 @@
 # Optargs:
 #       
 #       SIZE=200G
-#       VERSION=10.15.5
+#       VERSION=10.15.6
 #       ENV RAM=5
 #       ENV SMP=4
 #       ENV CORES=4
@@ -61,7 +61,7 @@ MAINTAINER 'https://sick.codes' <https://sick.codes>
 
 # change disk size here or add during build, e.g. --build-arg VERSION=10.14.5 --build-arg SIZE=50G
 ARG SIZE=200G
-ARG VERSION=10.15.5
+ARG VERSION=10.15.6
 
 # This fails on hub.docker.com, useful for debugging in cloud
 # RUN [[ $(egrep -c '(svm|vmx)' /proc/cpuinfo) -gt 0 ]] || { echo KVM not possible on this host && exit 1; }
@@ -159,18 +159,19 @@ RUN touch Launch.sh \
     && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=BaseSystem.img,format=raw \' \
     && tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=/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}-:22, -device e1000-82545em,netdev=net0,id=net0,mac=52:54:00:09:49:17 \' \
+    && tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT}-:5900, -device e1000-82545em,netdev=net0,id=net0,mac=52:54:00:09:49:17 \' \
     && tee -a Launch.sh <<< '-monitor stdio \' \
     && tee -a Launch.sh <<< '-vga vmware \' \
     && tee -a Launch.sh <<< '${EXTRA}'
 
 ENV USER arch
 
-ENV RAM=5
+ENV RAM=8
 ENV SMP=4
 ENV CORES=4
 ENV EXTRA=
 ENV INTERNAL_SSH_PORT=10022
+ENV SCREEN_SHARE_PORT=5900
 
 # if you're in the shell, export these variables to use then in envsubst
 # export RAM=5
@@ -178,6 +179,7 @@ ENV INTERNAL_SSH_PORT=10022
 # export CORES=4
 # export EXTRA=
 # export INTERNAL_SSH_PORT=10022
+# export SCREEN_SHARE_PORT=5900
 
 USER arch
 VOLUME ["/tmp/.X11-unix"]

From b6cd8a514bc1a09f9329a7bea358273c200c71a4 Mon Sep 17 00:00:00 2001
From: Ben Mitchell <realmrbenftw@gmail.com>
Date: Sun, 23 Aug 2020 21:13:30 +0100
Subject: [PATCH 2/3] Update README.md

no longer necessary to remove 1gb from the disk.
---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 039c7cf..6b792a5 100644
--- a/README.md
+++ b/README.md
@@ -80,9 +80,7 @@ docker start abc123xyz567
 
 # Click Disk Utility
 
-# Erase the biggest disk
-
-# Partition that disk and subtract 1GB and press Apply
+# Erase the biggest disk (around 200gb default), DO NOT MODIFY THE SMALLER DISKS.
 
 # Click Reinstall macOS
 

From 4a5ee5e7442e4789f459b1f50f25e14055bf1da0 Mon Sep 17 00:00:00 2001
From: Ben Mitchell <realmrbenftw@gmail.com>
Date: Sun, 23 Aug 2020 21:22:45 +0100
Subject: [PATCH 3/3] Update README.md

---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index 6b792a5..54079dd 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,18 @@ docker start abc123xyz567
 
 ```
 
+## Creating images:
+```
+# You can create an image of a already configured and setup container. This allows you to effectively duplicate a system.
+# To do this, run the following commands
+
+$ docker ps --all #make note of your container id
+$ docker commit containerID newImageName
+
+# To run this image do the following
+$ docker run --privileged -e "DISPLAY=${DISPLAY:-:0.0}" -v /tmp/.X11-unix:/tmp/.X11-unix newImageName
+```
+
 # Troubleshooting
 
 libgtk permissions denied error, thanks @raoulh + @arsham