This commit is contained in:
Jackson Delahunt 2019-02-17 18:17:56 +11:00
parent 9ba6dcdee8
commit 6f278229f1
6 changed files with 10 additions and 16 deletions

View file

@ -1,4 +1,4 @@
#!/bin/sh
# Start ssh keychain as jackson
# exec gosu jackson keychain
exec gosu jackson keychain

View file

@ -1,4 +1,4 @@
#!/bin/sh
# Start rescuetime as jackson
# exec gosu jackson rescuetime
exec gosu jackson rescuetime

View file

@ -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

View file

@ -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

View file

@ -6,4 +6,5 @@ export $($REPO_ROOT/scripts/environment.sh)
docker exec \
--interactive \
--tty \
--user $DESKTOP_ENVIRONMENT_USER \
$DESKTOP_ENVIRONMENT_CONTAINER zsh --login -c "$*"

View file

@ -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