From b3fd11d449635e4785da7c41685ab083ee493c09 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 16 Feb 2022 14:25:59 +0100
Subject: [PATCH] docker/l3d#106 Call cleanup from l3drun and not already from
within the project's l3d container
---
run/scripts/start | 8 ++++++++
start.sh | 4 ----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/run/scripts/start b/run/scripts/start
index 98bf37a..02407ea 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -30,6 +30,12 @@ function getConfig() {
fi
}
+function exitContainer() {
+ if [[ "$L3D_ALWAYS_CLEANUP" == "1" ]]; then
+ /usr/local/bin/.delete $COMPOSE_PROJECT_NAME
+ fi
+}
+
function startContainer() {
if [[ -n ${COMPOSE_PROJECT_NAME} ]]; then
mode=REBUILD
@@ -93,6 +99,7 @@ function startContainer() {
"${start_params[@]}" \
registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${L3DVERSION} \
/usr/local/bin/.start
+ exitContainer
return
fi
fi
@@ -102,6 +109,7 @@ function startContainer() {
--env SSHAUTH=${SSHAUTH} \
${COMPOSE_PROJECT_NAME}_l3d \
/usr/local/bin/.start
+ exitContainer
fi
}
diff --git a/start.sh b/start.sh
index 7852bb4..bb862bf 100755
--- a/start.sh
+++ b/start.sh
@@ -259,7 +259,3 @@ if [[ -x "${L3DSHELL}" ]]; then
else
/usr/bin/fish
fi
-
-if [[ "$L3D_ALWAYS_CLEANUP" == "1" ]]; then
- /usr/local/bin/.delete $COMPOSE_PROJECT_NAME
-fi
--
GitLab