From 0f918c11f15a0dee21a70e5dc37814806b4e5a5d Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@stemn.com>
Date: Fri, 11 Jan 2019 23:33:14 +1100
Subject: [PATCH] chrome

---
 chrome/chrome.json |  1 -
 scripts/chrome.sh  |  2 +-
 scripts/daemon.sh  | 31 +++++++++++++++++++++++++++++++
 scripts/shell.sh   | 29 ++---------------------------
 scripts/stop.sh    |  1 +
 5 files changed, 35 insertions(+), 29 deletions(-)
 create mode 100755 scripts/daemon.sh
 create mode 100755 scripts/stop.sh

diff --git a/chrome/chrome.json b/chrome/chrome.json
index 3047e64..e5b0f2d 100644
--- a/chrome/chrome.json
+++ b/chrome/chrome.json
@@ -1533,4 +1533,3 @@
         }
     ]
 }
-
diff --git a/scripts/chrome.sh b/scripts/chrome.sh
index 4c97603..627229f 100755
--- a/scripts/chrome.sh
+++ b/scripts/chrome.sh
@@ -1 +1 @@
-sh shell.sh chrome --user-data-dir=/jackson/home/.chrome
\ No newline at end of file
+sh $(dirname $0)/shell.sh chrome --user-data-dir=/jackson/home/.chrome
diff --git a/scripts/daemon.sh b/scripts/daemon.sh
new file mode 100755
index 0000000..f327f25
--- /dev/null
+++ b/scripts/daemon.sh
@@ -0,0 +1,31 @@
+REPO_ROOT=$(dirname $(realpath $0))/..
+
+docker run \
+  --detach \
+  --device /dev/snd \
+  --device /dev/dri \
+  --device /dev/video0 \
+  --device /dev/usb \
+  --device /dev/bus/usb \
+  --env DBUS_SESSION_BUS_ADDRESS \
+  --env DISPLAY \
+  --env SSH_AUTH_SOCK=/ssh-auth.sock \
+  --env STEMN_GIT_EMAIL="$(git config --get user.email)" \
+  --env STEMN_GIT_NAME="$(git config --get user.name)" \
+  --group-add audio \
+  --group-add video \
+  --interactive \
+  --name desktop-environment \
+  --rm \
+  --security-opt seccomp:$REPO_ROOT/chrome/chrome.json \
+  --tty \
+  --volume /dev/shm:/dev/shm \
+  --volume /etc/localtime:/etc/localtime:ro \
+  --volume /tmp/.X11-unix:/tmp/.X11-unix \
+  --volume /var/run/docker.sock:/var/run/docker.sock \
+  --volume $HOME/.ssh:$STEMN_HOME/.ssh \
+  --volume $HOME:/home \
+  --volume $SSH_AUTH_SOCK:/ssh-auth.sock \
+  --volume JACKSON_HOME:/jackson/home \
+  --workdir /home \
+  sabrehagen/development-environment:latest
diff --git a/scripts/shell.sh b/scripts/shell.sh
index c0c9122..30f7992 100755
--- a/scripts/shell.sh
+++ b/scripts/shell.sh
@@ -1,29 +1,4 @@
-docker run \
-  --device /dev/snd \
-  --device /dev/dri \
-  --device /dev/video0 \
-  --device /dev/usb \
-  --device /dev/bus/usb \
-  --env DISPLAY=$DISPLAY \
-  --env SSH_AUTH_SOCK=/ssh-auth.sock \
-  --env STEMN_GIT_EMAIL="$(git config --get user.email)" \
-  --env STEMN_GIT_NAME="$(git config --get user.name)" \
-  --group-add audio \
-  --group-add video \
+docker exec \
   --interactive \
-	--memory 6gb \
-  --name desktop-shell-$(date +%s) \
-  --rm \
-	--security-opt seccomp:/etc/docker/seccomp/chrome.json \
   --tty \
-	--volume /dev/shm:/dev/shm \
-  --volume /etc/hosts:/etc/hosts \
-  --VOLUME /etc/localtime:/etc/localtime:ro \
-  --VOLUME /tmp/.X11-unix:/tmp/.X11-unix \
-  --volume /var/run/docker.sock:/var/run/docker.sock \
-  --volume $HOME/.ssh:$STEMN_HOME/.ssh \
-  --volume $HOME:/home \
-  --volume $SSH_AUTH_SOCK:/ssh-auth.sock \
-  --volume JACKSON_HOME:/jackson/home \
-  --workdir /home \
-  sabrehagen/development-environment:latest "$@"
+  desktop-environment zsh "$@"
diff --git a/scripts/stop.sh b/scripts/stop.sh
new file mode 100755
index 0000000..189d94f
--- /dev/null
+++ b/scripts/stop.sh
@@ -0,0 +1 @@
+docker rm -f desktop-environment