From e227fd82c5a2828e714afcb44bcd922720fd9b02 Mon Sep 17 00:00:00 2001 From: Jackson Date: Sun, 3 Mar 2019 11:34:11 +0000 Subject: [PATCH] parallel --- docker/scripts/clean-hard.sh | 17 ++++++++++------- docker/scripts/clean-secrets.sh | 11 +++++++---- docker/scripts/clean.sh | 7 +++++-- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/docker/scripts/clean-hard.sh b/docker/scripts/clean-hard.sh index a180d58..63821f9 100755 --- a/docker/scripts/clean-hard.sh +++ b/docker/scripts/clean-hard.sh @@ -1,13 +1,16 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Remove volumes that can be recreated from scratch, but require manual configuration in app -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_CHROME -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_CODE -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_GITHUB -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_JUMP -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_TRAEFIK -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_ZOOM +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_CHROME & +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_CODE & +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_GITHUB & +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_JUMP & +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE & +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_TRAEFIK & +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_ZOOM & + +# Wait for wipes to complete in parallel +wait # Clean secrets and home $REPO_ROOT/docker/scripts/clean-secrets.sh diff --git a/docker/scripts/clean-secrets.sh b/docker/scripts/clean-secrets.sh index 51348f7..604e738 100755 --- a/docker/scripts/clean-secrets.sh +++ b/docker/scripts/clean-secrets.sh @@ -1,10 +1,13 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Remove volumes containing secrets -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_SECRETS -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_SIGNAL -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_SSH -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_VCSH_PRIVATE +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_SECRETS & +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_SIGNAL & +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_SSH & +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_VCSH_PRIVATE & + +# Wait for wipes to complete in parallel +wait # Perform standard clean $REPO_ROOT/docker/scripts/clean.sh diff --git a/docker/scripts/clean.sh b/docker/scripts/clean.sh index 3fafe1c..24bddad 100755 --- a/docker/scripts/clean.sh +++ b/docker/scripts/clean.sh @@ -4,8 +4,11 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../.. # $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_CACHE_VCSH -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_USER_HOME +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_VCSH & +$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_USER_HOME & + +# Wait for wipes to complete in parallel +wait # Ensure all docker volumes are owned after removing paths $REPO_ROOT/docker/scripts/take-ownership.sh