From 98c33e8511dadbe23c68d8128a98a88b5ecdc6ad Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@stemn.com>
Date: Sat, 16 Feb 2019 14:57:00 +1100
Subject: [PATCH] services

---
 Dockerfile                         | 22 ++++++++++------------
 root/etc/services.d/keychain/run   |  4 ++++
 root/etc/services.d/rescuetime/run |  4 ++++
 root/etc/services.d/tmux/run       |  5 +++++
 4 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100755 root/etc/services.d/keychain/run
 create mode 100755 root/etc/services.d/rescuetime/run
 create mode 100755 root/etc/services.d/tmux/run

diff --git a/Dockerfile b/Dockerfile
index b3aa9e7..15838f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,16 +19,21 @@ RUN apt-get update -qq && apt-get install -qq --fix-missing \
 RUN curl -L https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz | \
   tar -C / -xzf -
 
-# Install musikcube
-RUN wget -O musikcube.deb -nv https://github.com/clangen/musikcube/releases/download/0.62.0/musikcube_0.62.0_ubuntu_cosmic_amd64.deb && \
-  dpkg -i musikcube.deb || apt-get install -qq --fix-broken && \
-  rm musikcube.deb
+# Install resucetime time tracker
+RUN wget -O rescuetime.deb -nv https://www.rescuetime.com/installers/rescuetime_current_amd64.deb && \
+  dpkg -i rescuetime.deb || apt-get install -qq --fix-broken && \
+  rm rescuetime.deb
 
 # Install zoom conferencing
 RUN wget -O zoom.deb -nv https://zoom.us/client/latest/zoom_amd64.deb && \
   dpkg -i zoom.deb || apt-get install -qq --fix-broken && \
   rm zoom.deb
 
+# Install musikcube
+RUN wget -O musikcube.deb -nv https://github.com/clangen/musikcube/releases/download/0.62.0/musikcube_0.62.0_ubuntu_cosmic_amd64.deb && \
+  dpkg -i musikcube.deb || apt-get install -qq --fix-broken && \
+  rm musikcube.deb
+
 # Install chrome
 RUN apt-get update -qq && apt-get install -qq \
   apt-transport-https \
@@ -52,18 +57,11 @@ RUN apt-get update -qq && apt-get install -qq \
   groupadd --system chrome
 
 # Install vs code
-RUN echo "deb http://au.archive.ubuntu.com/ubuntu/ xenial main restricted universe" > /etc/apt/sources.list && \
-  apt-get update -qq && \
-  wget -O code.deb -nv https://go.microsoft.com/fwlink/?LinkID=760868 && \
+RUN wget -O code.deb -nv https://go.microsoft.com/fwlink/?LinkID=760868 && \
   apt-get install -qq ./code.deb && \
   rm code.deb && \
   apt-get install -qq libicu[0-9][0-9] libkrb5-3 zlib1g libsecret-1-0 desktop-file-utils x11-utils # vs live share dependencies
 
-# Install resucetime time tracker
-RUN wget -O rescuetime.deb -nv https://www.rescuetime.com/installers/rescuetime_current_amd64.deb && \
-  dpkg -i rescuetime.deb || apt-get install -qq --fix-broken && \
-  rm rescuetime.deb
-
 # Install yarn utilities
 RUN yarn global add \
   http-server
diff --git a/root/etc/services.d/keychain/run b/root/etc/services.d/keychain/run
new file mode 100755
index 0000000..50f7162
--- /dev/null
+++ b/root/etc/services.d/keychain/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Start ssh keychain as jackson
+exec s6-setuidgid jackson keychain
diff --git a/root/etc/services.d/rescuetime/run b/root/etc/services.d/rescuetime/run
new file mode 100755
index 0000000..053c2f1
--- /dev/null
+++ b/root/etc/services.d/rescuetime/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Start rescuetime as jackson
+exec s6-setuidgid jackson rescuetime
diff --git a/root/etc/services.d/tmux/run b/root/etc/services.d/tmux/run
new file mode 100755
index 0000000..42cd2a3
--- /dev/null
+++ b/root/etc/services.d/tmux/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Start tmux server as jackson
+exec s6-setuidgid jackson \
+  tmux new-session -s desktop-environment zsh --login