diff --git a/root/etc/services.d/keychain/run b/root/etc/services.d/keychain/run index 1fd3e00..4f8d13f 100755 --- a/root/etc/services.d/keychain/run +++ b/root/etc/services.d/keychain/run @@ -1,4 +1,4 @@ #!/bin/sh # Start ssh keychain as jackson -# exec gosu jackson keychain +exec gosu jackson keychain diff --git a/root/etc/services.d/rescuetime/run b/root/etc/services.d/rescuetime/run index 0caa446..6bdeb9d 100755 --- a/root/etc/services.d/rescuetime/run +++ b/root/etc/services.d/rescuetime/run @@ -1,4 +1,4 @@ #!/bin/sh # Start rescuetime as jackson -# exec gosu jackson rescuetime +exec gosu jackson rescuetime diff --git a/root/etc/services.d/sleep/run b/root/etc/services.d/sleep/run deleted file mode 100755 index 781d472..0000000 --- a/root/etc/services.d/sleep/run +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# Start sleep to keep container running -echo ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZz -echo ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZz -echo ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZz -echo ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZz -echo ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZz -echo ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZz -echo ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZz -exec sleep infinity diff --git a/root/etc/services.d/tmux/run b/root/etc/services.d/tmux/run index 9ebcfeb..c486a76 100755 --- a/root/etc/services.d/tmux/run +++ b/root/etc/services.d/tmux/run @@ -1,5 +1,5 @@ #!/bin/sh # Start tmux server as jackson -# exec gosu jackson \ -# tmux new-session -d -s desktop-environment zsh --login +exec gosu jackson \ + tmux new-session -d -s desktop-environment zsh --login diff --git a/scripts/exec.sh b/scripts/exec.sh index 38a2399..62fd491 100755 --- a/scripts/exec.sh +++ b/scripts/exec.sh @@ -6,4 +6,5 @@ export $($REPO_ROOT/scripts/environment.sh) docker exec \ --interactive \ --tty \ + --user $DESKTOP_ENVIRONMENT_USER \ $DESKTOP_ENVIRONMENT_CONTAINER zsh --login -c "$*" diff --git a/scripts/start.sh b/scripts/start.sh index 1e7920e..515c981 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -25,7 +25,6 @@ docker run \ --rm \ --security-opt seccomp:$REPO_ROOT/config/chrome/chrome.json \ --tty \ - --user $DESKTOP_ENVIRONMENT_USER \ --volume /dev/shm:/dev/shm \ --volume /etc/localtime:/etc/localtime:ro \ --volume /tmp/.X11-unix:/tmp/.X11-unix \ @@ -60,3 +59,8 @@ docker run \ # Wait until the desktop environment container is running before proceeding until docker inspect $DESKTOP_ENVIRONMENT_CONTAINER | grep Status | grep -m 1 running >/dev/null; do sleep 1; done + +# Start desktop services +docker exec $DESKTOP_ENVIRONMENT_CONTAINER s6-svc -u /run/s6/services/tmux +docker exec $DESKTOP_ENVIRONMENT_CONTAINER s6-svc -u /run/s6/services/tmux +docker exec $DESKTOP_ENVIRONMENT_CONTAINER s6-svc -u /run/s6/services/tmux