From 2753eebcb02a17806d02a97d8bb8c4b1e4e1aba9 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Mon, 14 Oct 2019 12:59:06 +1100 Subject: [PATCH] jump --- docker/Dockerfile | 6 +++++- docker/scripts/clean-secrets.sh | 4 ---- docker/scripts/clean.sh | 10 ---------- docker/scripts/environment.sh | 1 - docker/scripts/recycle-dotfiles.sh | 1 - docker/scripts/recycle-xpra.sh | 13 ------------- docker/scripts/recycle.sh | 1 - docker/scripts/start.sh | 5 +---- 8 files changed, 6 insertions(+), 35 deletions(-) delete mode 100755 docker/scripts/clean.sh delete mode 100755 docker/scripts/recycle-xpra.sh diff --git a/docker/Dockerfile b/docker/Dockerfile index 9ee3bc4..b28724a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 && \ diff --git a/docker/scripts/clean-secrets.sh b/docker/scripts/clean-secrets.sh index 02ec2ae..0a95e10 100755 --- a/docker/scripts/clean-secrets.sh +++ b/docker/scripts/clean-secrets.sh @@ -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 & diff --git a/docker/scripts/clean.sh b/docker/scripts/clean.sh deleted file mode 100755 index 1952b79..0000000 --- a/docker/scripts/clean.sh +++ /dev/null @@ -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 diff --git a/docker/scripts/environment.sh b/docker/scripts/environment.sh index fc5bad8..f472487 100755 --- a/docker/scripts/environment.sh +++ b/docker/scripts/environment.sh @@ -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 diff --git a/docker/scripts/recycle-dotfiles.sh b/docker/scripts/recycle-dotfiles.sh index a5d5eaa..f28058e 100755 --- a/docker/scripts/recycle-dotfiles.sh +++ b/docker/scripts/recycle-dotfiles.sh @@ -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 diff --git a/docker/scripts/recycle-xpra.sh b/docker/scripts/recycle-xpra.sh deleted file mode 100755 index 8d1e3da..0000000 --- a/docker/scripts/recycle-xpra.sh +++ /dev/null @@ -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 diff --git a/docker/scripts/recycle.sh b/docker/scripts/recycle.sh index bc6a07f..d43eee8 100755 --- a/docker/scripts/recycle.sh +++ b/docker/scripts/recycle.sh @@ -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 diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh index ba7c705..f1519f6 100755 --- a/docker/scripts/start.sh +++ b/docker/scripts/start.sh @@ -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