maverick/desktop-environment
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/desktop-environment.git synced 2026-07-26 06:37:21 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

jump

Browse source
This commit is contained in:
Jackson Delahunt 2019-10-14 12:59:06 +11:00
parent 08ee3576de
commit 2753eebcb0
8 changed files with 6 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/Dockerfile
View file

@ -37,7 +37,6 @@ RUN apt-get update -qq && \
alttab \
arandr \
asciinema \
autojump \
autorandr \
build-essential \
cmake \
@ -198,6 +197,11 @@ RUN go get github.com/moul/gotty-client/cmd/gotty-client
# Install helm
RUN curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash
# Install jump directory navigator
RUN wget -qnv -O jump.deb https://github.com/gsamokovarov/jump/releases/download/v0.22.0/jump_0.22.0_amd64.deb && \
dpkg -i jump.deb && \
rm jump.deb
# Install kind
RUN wget -qnv -O kind https://github.com/kubernetes-sigs/kind/releases/download/v0.3.0/kind-linux-amd64 && \
chmod +x kind && \

4
docker/scripts/clean-secrets.sh
View file

@ -1,11 +1,7 @@
REPO_ROOT=$(dirname $(readlink -f $0))/../..
# Perform standard clean
$REPO_ROOT/docker/scripts/clean.sh
# Clean volumes containing private data
$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_GDRIVE &
$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_SECRETS &
$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_SIGNAL &
$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_SSH &

10
docker/scripts/clean.sh
View file

@ -1,10 +0,0 @@
REPO_ROOT=$(dirname $(readlink -f $0))/../..
# Stop the running environment so there are no containers using the volumes, ignoring errors if it does not exist
$REPO_ROOT/docker/scripts/stop.sh 2>/dev/null
# Remove stateful volumes that are recreated directly from the container filesystem
$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_USER_HOME &
# Wait for cleans to complete in parallel
wait

1
docker/scripts/environment.sh
View file

@ -31,7 +31,6 @@ echo export DESKTOP_ENVIRONMENT_CACHE_CERTIFICATES=$DESKTOP_ENVIRONMENT_USER_HOM
echo export DESKTOP_ENVIRONMENT_CACHE_CHROME=$DESKTOP_ENVIRONMENT_USER_HOME/.cache/google-chrome
echo export DESKTOP_ENVIRONMENT_CACHE_CODE=$DESKTOP_ENVIRONMENT_USER_HOME/.vscode
echo export DESKTOP_ENVIRONMENT_CACHE_GDRIVE=$DESKTOP_ENVIRONMENT_USER_HOME/.gdfuse
echo export DESKTOP_ENVIRONMENT_CACHE_SECRETS=$DESKTOP_ENVIRONMENT_USER_HOME/.secrets
echo export DESKTOP_ENVIRONMENT_CACHE_SSH=$DESKTOP_ENVIRONMENT_USER_HOME/.ssh
echo export DESKTOP_ENVIRONMENT_CACHE_STEMN=$DESKTOP_ENVIRONMENT_USER_HOME/.stemn
echo export DESKTOP_ENVIRONMENT_CACHE_TMUX=$DESKTOP_ENVIRONMENT_USER_HOME/.tmux

1
docker/scripts/recycle-dotfiles.sh
View file

@ -7,6 +7,5 @@ $REPO_ROOT/docker/scripts/build-dotfiles.sh
$REPO_ROOT/docker/scripts/pre-clean.sh
# Reset the desktop environment state
$REPO_ROOT/docker/scripts/clean.sh
$REPO_ROOT/docker/scripts/start.sh
$REPO_ROOT/docker/scripts/alacritty.sh

13
docker/scripts/recycle-xpra.sh
View file

@ -1,13 +0,0 @@
REPO_ROOT=$(dirname $(readlink -f $0))/../..
# Rebuild the desktop environment
$REPO_ROOT/docker/scripts/build.sh
# Check for data loss before recycling
$REPO_ROOT/docker/scripts/pre-clean.sh
# Reset the desktop environment state
$REPO_ROOT/docker/scripts/stop.sh
$REPO_ROOT/docker/scripts/clean.sh
$REPO_ROOT/docker/scripts/start-xpra.sh
$REPO_ROOT/docker/scripts/alacritty.sh

1
docker/scripts/recycle.sh
View file

@ -7,6 +7,5 @@ $REPO_ROOT/docker/scripts/build.sh
$REPO_ROOT/docker/scripts/pre-clean.sh
# Reset the desktop environment state
$REPO_ROOT/docker/scripts/clean.sh
$REPO_ROOT/docker/scripts/start.sh
$REPO_ROOT/docker/scripts/alacritty.sh

5
docker/scripts/start.sh
View file

@ -3,9 +3,6 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../..
# Export desktop environment shell configuration
eval "$($REPO_ROOT/docker/scripts/environment.sh)"
# Ensure volumes that can be removed are owned before starting
$REPO_ROOT/docker/scripts/clean.sh
# Ensure the desktop environment network exists
docker network create $DESKTOP_ENVIRONMENT_DOCKER_NETWORK
@ -46,7 +43,6 @@ docker run \
--volume DESKTOP_ENVIRONMENT_CACHE_CHROME:$DESKTOP_ENVIRONMENT_CACHE_CHROME \
--volume DESKTOP_ENVIRONMENT_CACHE_CODE:$DESKTOP_ENVIRONMENT_CACHE_CODE \
--volume DESKTOP_ENVIRONMENT_CACHE_GDRIVE:$DESKTOP_ENVIRONMENT_CACHE_GDRIVE \
--volume DESKTOP_ENVIRONMENT_CACHE_SECRETS:$DESKTOP_ENVIRONMENT_CACHE_SECRETS \
--volume DESKTOP_ENVIRONMENT_CACHE_SSH:$DESKTOP_ENVIRONMENT_CACHE_SSH \
--volume DESKTOP_ENVIRONMENT_CACHE_STEMN:$DESKTOP_ENVIRONMENT_CACHE_STEMN \
--volume DESKTOP_ENVIRONMENT_CACHE_TMUX:$DESKTOP_ENVIRONMENT_CACHE_TMUX \
@ -79,3 +75,4 @@ until docker inspect $DESKTOP_ENVIRONMENT_CONTAINER_NAME | grep Status | grep -m
# Start the desktop environment inside the container
$REPO_ROOT/docker/scripts/exec.sh /home/$DESKTOP_ENVIRONMENT_USER/.config/scripts/startup.sh
$REPO_ROOT/docker/scripts/alacritty.sh