From 11f911f2aa67e20d2287f489a001c5817035d683 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Sun, 4 Dec 2022 22:14:28 +1100 Subject: [PATCH] environment-state --- docker/Dockerfile | 5 +++++ docker/scripts/environment.sh | 5 ++++- docker/scripts/start.sh | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1304ed4..ecb4668 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -346,6 +346,11 @@ RUN wget -O rescuetime.deb -nv https://www.rescuetime.com/installers/rescuetime_ dpkg -i rescuetime.deb || apt-get install -qq --fix-broken && \ rm rescuetime.deb +# Install whatsdesk +RUN wget -O whatsdesk.deb -nv https://zerkc.gitlab.io/whatsdesk/whatsdesk_0.3.9_amd64.deb && \ + dpkg -i whatsdesk.deb && \ + rm whatsdesk.deb + # Install speedtest RUN pip3 install --user speedtest-cli diff --git a/docker/scripts/environment.sh b/docker/scripts/environment.sh index 7e66261..ba72d8b 100755 --- a/docker/scripts/environment.sh +++ b/docker/scripts/environment.sh @@ -3,7 +3,7 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../.. DESKTOP_ENVIRONMENT_USER=$USER DESKTOP_ENVIRONMENT_CONTAINER_IMAGE=desktop-environment DESKTOP_ENVIRONMENT_CONTAINER_NAME=${DESKTOP_ENVIRONMENT_CONTAINER_NAME-$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE} -DESKTOP_ENVIRONMENT_GITHUB_TOKEN=${DESKTOP_ENVIRONMENT_GITHUB_TOKEN-ghp_U8Ak0x4f0ZDYExzLlXsNA5hw8R3pfu2jKbmU} +DESKTOP_ENVIRONMENT_GITHUB_TOKEN=${DESKTOP_ENVIRONMENT_GITHUB_TOKEN-} DESKTOP_ENVIRONMENT_GITHUB_USER=$(git --git-dir $REPO_ROOT/.git remote get-url origin | sed -E 's;.*github.com.(.*)/.*;\1;') DESKTOP_ENVIRONMENT_REGISTRY=${DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_GITHUB_USER} @@ -35,11 +35,14 @@ echo export DESKTOP_ENVIRONMENT_CACHE_ZSH=$DESKTOP_ENVIRONMENT_USER_HOME/.cache/ echo export DESKTOP_ENVIRONMENT_STATE_BEEKEEPER=$DESKTOP_ENVIRONMENT_USER_HOME/.config/beekeeper-studio echo export DESKTOP_ENVIRONMENT_STATE_CHROME=$DESKTOP_ENVIRONMENT_USER_HOME/.config/google-chrome echo export DESKTOP_ENVIRONMENT_STATE_CODE=$DESKTOP_ENVIRONMENT_USER_HOME/.config/Code +echo export DESKTOP_ENVIRONMENT_STATE_DISCORD=$DESKTOP_ENVIRONMENT_USER_HOME/.config/discord echo export DESKTOP_ENVIRONMENT_STATE_I3=$DESKTOP_ENVIRONMENT_USER_HOME/.config/i3/i3-resurrect echo export DESKTOP_ENVIRONMENT_STATE_JUMP=$DESKTOP_ENVIRONMENT_USER_HOME/.jump echo export DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE=$DESKTOP_ENVIRONMENT_USER_HOME/.config/musikcube/1 echo export DESKTOP_ENVIRONMENT_STATE_NCHAT=$DESKTOP_ENVIRONMENT_USER_HOME/.config/nchat echo export DESKTOP_ENVIRONMENT_STATE_RESCUETIME=$DESKTOP_ENVIRONMENT_USER_HOME/.config/RescueTime.com +echo export DESKTOP_ENVIRONMENT_STATE_TELEGRAM=$DESKTOP_ENVIRONMENT_USER_HOME/.local/share/TelegramDesktop +echo export DESKTOP_ENVIRONMENT_STATE_WHATSDESK=$DESKTOP_ENVIRONMENT_USER_HOME/.config/whatsdesk echo export DESKTOP_ENVIRONMENT_STATE_X11=/tmp/.X11-unix # Desktop environment user state volumes diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh index 04f48ab..1329e10 100755 --- a/docker/scripts/start.sh +++ b/docker/scripts/start.sh @@ -46,10 +46,13 @@ docker run \ --volume DESKTOP_ENVIRONMENT_STATE_BEEKEEPER:$DESKTOP_ENVIRONMENT_STATE_BEEKEEPER \ --volume DESKTOP_ENVIRONMENT_STATE_CHROME:$DESKTOP_ENVIRONMENT_STATE_CHROME \ --volume DESKTOP_ENVIRONMENT_STATE_CODE:$DESKTOP_ENVIRONMENT_STATE_CODE \ + --volume DESKTOP_ENVIRONMENT_STATE_DISCORD:$DESKTOP_ENVIRONMENT_STATE_DISCORD \ --volume DESKTOP_ENVIRONMENT_STATE_I3:$DESKTOP_ENVIRONMENT_STATE_I3 \ --volume DESKTOP_ENVIRONMENT_STATE_JUMP:$DESKTOP_ENVIRONMENT_STATE_JUMP \ --volume DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE:$DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE \ --volume DESKTOP_ENVIRONMENT_STATE_RESCUETIME:$DESKTOP_ENVIRONMENT_STATE_RESCUETIME \ + --volume DESKTOP_ENVIRONMENT_STATE_TELEGRAM:$DESKTOP_ENVIRONMENT_STATE_TELEGRAM \ + --volume DESKTOP_ENVIRONMENT_STATE_WHATSDESK:$DESKTOP_ENVIRONMENT_STATE_WHATSDESK \ --volume DESKTOP_ENVIRONMENT_STATE_X11:/tmp/.X11-unix \ --volume DESKTOP_ENVIRONMENT_USER_APPS:$DESKTOP_ENVIRONMENT_USER_APPS \ --volume DESKTOP_ENVIRONMENT_USER_DOCUMENTS:$DESKTOP_ENVIRONMENT_USER_DOCUMENTS \