#106 Call cleanup from l3drun and not already from within the project's l3d container

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
 }
 

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