From 46c38df2dafe44c1347350ba8ea39fca740658d5 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 7 Jan 2021 13:31:32 +0100
Subject: [PATCH] docker/l3d#75 Non-persistent mode
---
run/scripts/start | 40 ++++++++++++++++++++++++++++++++++++----
1 file changed, 36 insertions(+), 4 deletions(-)
diff --git a/run/scripts/start b/run/scripts/start
index e7fd7a0..23060ca 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -32,6 +32,34 @@ function getConfig {
function startContainer {
if [[ -n ${COMPOSE_PROJECT_NAME} ]]; then
+ if [[ $COMPOSE_PROJECT_NAME = "." ]]; then
+ docker run -it \
+ --hostname ${COMPOSE_PROJECT_NAME}-l3d \
+ --user ${USERID}:${GROUPID} \
+ --group-add ${GROUPIDS// / --group-add } \
+ --env L3DVERSION=${L3DVERSION} \
+ --env L3DSHELL=${L3DSHELL} \
+ --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
+ --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
+ --env PHP_VERSION=${PHP_VERSION} \
+ --env SSH_AUTH_SOCK=${SSHAUTHSOCK} \
+ --env HOMEDIR=${HOMEDIR} \
+ --env WORKDIR=${WORKDIR} \
+ --env SSHAUTH=${SSHAUTH} \
+ --volume /var/run/docker.sock:/var/run/docker.sock \
+ --volume ${WORKDIR}:/drupal \
+ --volume /etc/group:/etc/group:ro \
+ --volume /etc/passwd:/etc/passwd:ro \
+ --volume /etc/shadow:/etc/shadow:ro \
+ --volume /etc/sudoers:/etc/sudoers:ro \
+ --volume /etc/sudoers.d:/etc/sudoers.d:ro \
+ --volume ${SSHAUTH}:${SSHAUTHSOCK} \
+ --volume ${HOMEDIR}:${HOMEDIR} \
+ --workdir /drupal \
+ registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${L3DVERSION} \
+ /usr/local/bin/.start
+ return
+ fi
ID=$(docker container ls --all -q -f name=^${COMPOSE_PROJECT_NAME}_l3d$)
if [[ -n ${ID} ]]; then
docker start ${COMPOSE_PROJECT_NAME}_l3d
@@ -69,10 +97,14 @@ function startContainer {
}
if [[ -n $1 ]]; then
- ID=$(docker container ls --all -q -f name=^$1_l3d$)
- if [[ -n ${ID} ]]; then
- PHP_VERSION=unknown
- COMPOSE_PROJECT_NAME=$1
+ if [[ "$1" = "." ]]; then
+ COMPOSE_PROJECT_NAME=.
+ else
+ ID=$(docker container ls --all -q -f name=^$1_l3d$)
+ if [[ -n ${ID} ]]; then
+ PHP_VERSION=unknown
+ COMPOSE_PROJECT_NAME=$1
+ fi
fi
fi
getConfig
--
GitLab