From 4e71bddc611f875c215810748f3224ba2f1c0f6c Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Thu, 29 Feb 2024 17:09:18 +0100
Subject: [PATCH] docker/gitlab-drupal-ci#48 Make L3D container names user
specific
---
run/scripts/dir | 2 +-
run/scripts/start | 10 +++++-----
setup/scripts/l3d | 2 +-
start.sh | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/run/scripts/dir b/run/scripts/dir
index 801a8ff..4860dc9 100755
--- a/run/scripts/dir
+++ b/run/scripts/dir
@@ -1,5 +1,5 @@
#!/bin/bash
if [[ -n $1 ]]; then
- docker inspect ${1}_l3d | jq -r .[0].Config.Env | grep L3DHOSTDIR | cut -d'=' -f 2 | cut -d'"' -f 1
+ docker inspect ${1}_${USERNAME}_l3d | jq -r .[0].Config.Env | grep L3DHOSTDIR | cut -d'=' -f 2 | cut -d'"' -f 1
fi
diff --git a/run/scripts/start b/run/scripts/start
index c3f546d..3f65ed3 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -51,9 +51,9 @@ function startContainer() {
if [[ $COMPOSE_PROJECT_NAME == "." ]]; then
mode=NONPRESISTENT
else
- ID=$(docker container ls --all -q -f name=^${COMPOSE_PROJECT_NAME}_l3d$)
+ ID=$(docker container ls --all -q -f name=^${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d$)
if [[ -n ${ID} ]]; then
- docker start ${COMPOSE_PROJECT_NAME}_l3d
+ docker start ${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d
mode=REGULAR
fi
fi
@@ -98,7 +98,7 @@ function startContainer() {
start_params+=(
--hostname ${COMPOSE_PROJECT_NAME}-l3d
)
- docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
+ docker run --name ${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d -dt \
"${start_params[@]}" \
--restart unless-stopped \
registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${L3DVERSION}
@@ -137,7 +137,7 @@ function startContainer() {
fi
docker exec -it \
"${start_params[@]}" \
- ${COMPOSE_PROJECT_NAME}_l3d \
+ ${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d \
/usr/local/bin/.start
exitContainer
fi
@@ -147,7 +147,7 @@ if [[ -n $1 ]]; then
if [[ "$1" == "." ]]; then
COMPOSE_PROJECT_NAME=.
else
- ID=$(docker container ls --all -q -f name=^$1_l3d$)
+ ID=$(docker container ls --all -q -f name=^$1_${USERNAME}_l3d$)
if [[ -n ${ID} ]]; then
PHP_VERSION=unknown
COMPOSE_PROJECT_NAME=$1
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index 74c31a8..793f60a 100755
--- a/setup/scripts/l3d
+++ b/setup/scripts/l3d
@@ -81,7 +81,7 @@ fi
# Chenge directory to the existing project root, if available.
if [[ -n $1 ]]; then
- ID=$(docker container ls --all -q -f name=^$1_l3d$)
+ ID=$(docker container ls --all -q -f name=^$1_${USERNAME}_l3d$)
if [[ -n ${ID} ]]; then
cd $(docker exec ${ID} php /usr/local/bin/volume.php --none)
fi
diff --git a/start.sh b/start.sh
index 0d6cf30..1fa8357 100755
--- a/start.sh
+++ b/start.sh
@@ -250,7 +250,7 @@ if [[ "$INSTALLED_PHP_VERSION" != "$PHP_VERSION" ]]; then
if [[ "${COMPOSE_PROJECT_NAME}" != "." ]]; then
echo -e "\\033[31m Killed the outdated container, please start again !!! \\033[0m"
echo -e "\\033[31m ===================================================== \\033[0m"
- docker rm -f ${COMPOSE_PROJECT_NAME}_l3d
+ docker rm -f ${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d
fi
fi
if [[ "$COMPOSER_DOWNGRADE" == "1" ]]; then
@@ -286,8 +286,8 @@ if [[ "${COMPOSE_PROJECT_NAME}" != "." ]]; then
echo "#!/bin/sh" > .git/hooks/post-checkout
chmod +x .git/hooks/post-checkout
fi
- OLDCOMMAND='docker exec '${COMPOSE_PROJECT_NAME}'_l3d /usr/local/bin/update-env'
- NEWCOMMAND='RUNNING=$(docker container ls --all -q -f name='${COMPOSE_PROJECT_NAME}'_l3d);if [ "x$RUNNING" != "x" ];then docker exec '${COMPOSE_PROJECT_NAME}'_l3d /usr/local/bin/update-env;fi'
+ OLDCOMMAND='docker exec '${COMPOSE_PROJECT_NAME}'_'${USERNAME}'_l3d /usr/local/bin/update-env'
+ NEWCOMMAND='RUNNING=$(docker container ls --all -q -f name='${COMPOSE_PROJECT_NAME}'_'${USERNAME}_'l3d);if [ "x$RUNNING" != "x" ];then docker exec '${COMPOSE_PROJECT_NAME}'_l3d /usr/local/bin/update-env;fi'
OLD_HOOK_DEFINED=$(grep "$OLDCOMMAND" .git/hooks/post-checkout)
NEW_HOOK_DEFINED=$(grep "$NEWCOMMAND" .git/hooks/post-checkout)
if [[ "x$OLD_HOOK_DEFINED" = "x" ]]; then
--
GitLab