From 863fa2fd402e542dba5adf8994d9cb1d901e5d4d Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 8 Nov 2021 14:08:31 +0100
Subject: [PATCH] docker/l3d#104 Delete after leaving l3d if L3D_ALWAYS_CLEANUP
is set to 1
---
Dockerfile | 1 +
run/scripts/info | 1 +
run/scripts/start | 1 +
setup/scripts/l3d | 6 ++++++
start.sh | 4 ++++
5 files changed, 13 insertions(+)
diff --git a/Dockerfile b/Dockerfile
index 686d5f9..17107ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,6 +20,7 @@ ADD ahoy.changelog.yml /etc/ahoy/changelog.yml
ADD run/scripts/info /usr/local/bin/l3d
ADD run/scripts/version /usr/local/bin/version
ADD run/scripts/l3dnewversion /usr/local/bin/l3dnewversion
+ADD run/scripts/delete /usr/local/bin/.delete
RUN echo "Install dorgflow" && \
cd /var/opt && \
diff --git a/run/scripts/info b/run/scripts/info
index d802464..8485082 100755
--- a/run/scripts/info
+++ b/run/scripts/info
@@ -40,6 +40,7 @@ function infohost() {
echo "User: ${USERNAME} (${USERID}:${GROUPID} - ${GROUPIDS})"
echo "Home: ${HOMEDIR}"
echo "Shell: ${L3DSHELL}"
+ echo "Cleanup: ${L3D_ALWAYS_CLEANUP}"
echo "Workdir: ${WORKDIR}"
echo "SSH: ${SSHAUTH} - ${SSHAUTHSOCK}"
sectionFooter
diff --git a/run/scripts/start b/run/scripts/start
index e4af188..fcd793d 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -46,6 +46,7 @@ function startContainer() {
start_params=(
--env L3DVERSION=${L3DVERSION}
--env L3DSHELL=${L3DSHELL}
+ --env L3D_ALWAYS_CLEANUP=${L3D_ALWAYS_CLEANUP}
--env HOME=/home/${USERNAME}
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
--env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE}
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index 00af88b..ac6416d 100755
--- a/setup/scripts/l3d
+++ b/setup/scripts/l3d
@@ -73,6 +73,11 @@ else
L3DSHELL="/usr/bin/fish"
fi
+# Set l3d cleanup
+if [[ "x${L3D_ALWAYS_CLEANUP}" == "x" ]]; then
+ L3D_ALWAYS_CLEANUP=0
+fi
+
# Read environment variables
if [[ -f "${HOME}/.env" ]]; then
export $(cat ${HOME}/.env | xargs) > /dev/null 2>&1
@@ -89,6 +94,7 @@ project_params=(
--env GROUPIDS="${GROUPIDS}"
--env HOMEDIR=${HOME}
--env L3DSHELL=${L3DSHELL}
+ --env L3D_ALWAYS_CLEANUP=${L3D_ALWAYS_CLEANUP}
--env WORKDIR=${PWD}
--env SSHAUTH=${SSHAUTH}
--env SSHAUTHSOCK=${SSHAUTHSOCK}
diff --git a/start.sh b/start.sh
index cf13a6e..e5a18c3 100755
--- a/start.sh
+++ b/start.sh
@@ -259,3 +259,7 @@ if [[ -x "${L3DSHELL}" ]]; then
else
/usr/bin/fish
fi
+
+if [[ "$L3D_ALWAYS_CLEANUP" == "1" ]]; then
+ /usr/local/bin/.delete $COMPOSE_PROJECT_NAME
+fi
--
GitLab