From 0da2ed7bd1cd7be76b6803a0c638036614a8f7b9 Mon Sep 17 00:00:00 2001 From: Malfurious Date: Mon, 30 Oct 2023 14:11:00 -0400 Subject: Merge data volumes I need something more complicated than just 1 new directory for logs, so let's go to the trouble now of merging the persistent volumes together and use subdirectories/files. The default location is now '/data'. To aid similar changes in the future, the locations of these persistent files are no longer hard-coded in the source, but defined by global shell variables. Additionally, a bug is fixed which impacted our ability to accurately clean old logs and calculate the next job number. Signed-off-by: Malfurious --- acid/acid-remove | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'acid/acid-remove') diff --git a/acid/acid-remove b/acid/acid-remove index 6094a23..2c96669 100755 --- a/acid/acid-remove +++ b/acid/acid-remove @@ -5,11 +5,11 @@ # Stop the service , which was previously managed by cychedelic, and # remove associated files. -name=$(cat "/services/$1/.git/previous_slug") +name=$(cat "$CYCHE_SERVICE_DIR/$1/.git/previous_slug") [ -z "$name" ] && name="$1" docker compose --project-name "$name" down echo "Removing files..." -rm -rf "/services/$1" +rm -rf "$CYCHE_SERVICE_DIR/$1" echo "Done." -- cgit v1.2.3