From 00360491ec531a5cfe016dd094c59b3322e28cda Mon Sep 17 00:00:00 2001
From: pedro <git2021@cas.cat>
Date: Tue, 16 Jan 2024 11:19:55 +0100
Subject: [PATCH] fix docker project namespaces

---
 build__pilot-lafede.sh | 12 ++++++------
 build__pilot-setem.sh  | 12 ++++++------
 build__pilot-xo9b.sh   | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/build__pilot-lafede.sh b/build__pilot-lafede.sh
index 390ecb3..097796a 100755
--- a/build__pilot-lafede.sh
+++ b/build__pilot-lafede.sh
@@ -20,23 +20,23 @@ main() {
                 git checkout pilot-lafede
         )
 
-        postfix='pilot-lafede'
-        local idhub1="idhub1__${postfix}"
+        pilot='pilot-lafede'
+        local idhub1="idhub1__${pilot}"
 
         # force recreate
         rm -rf "./${idhub1}"
 
         # detect if is new
         if [ ! -f "./${idhub1}" ]; then
-                echo 'Detected new deployment, recreating git repos idhub1 and idhub2'
+                echo 'Detected new deployment, recreating idhub git repo'
                 cp -rp IdHub "${idhub1}"
                 rm -f "${idhub1}/db.sqlite3"
         fi
 
-        idhub_dc_f="docker-compose__${postfix}.yml"
-        docker compose -f ${idhub_dc_f} down -v || true
+        idhub_dc_f="docker-compose__${pilot}.yml"
+        docker compose -p ${pilot} -f ${idhub_dc_f} down -v || true
         make idhub_build \
-                && docker compose -f ${idhub_dc_f} up ${detach:-}
+                && docker compose -p ${pilot} -f ${idhub_dc_f} up ${detach:-}
 }
 
 main "${@}"
diff --git a/build__pilot-setem.sh b/build__pilot-setem.sh
index 77255ce..75f7345 100755
--- a/build__pilot-setem.sh
+++ b/build__pilot-setem.sh
@@ -20,9 +20,9 @@ main() {
                 git checkout pilot-setem
         )
 
-        postfix='pilot-setem'
-        local idhub1="idhub1__${postfix}"
-        local idhub2="idhub2__${postfix}"
+        pilot='pilot-setem'
+        local idhub1="idhub1__${pilot}"
+        local idhub2="idhub2__${pilot}"
 
         # force recreate
         rm -rf "./${idhub1}" "./${idhub2}"
@@ -36,10 +36,10 @@ main() {
                 rm -f "${idhub2}/db.sqlite3"
         fi
 
-        idhub_dc_f="docker-compose__${postfix}.yml"
-        docker compose -f ${idhub_dc_f} down -v || true
+        idhub_dc_f="docker-compose__${pilot}.yml"
+        docker compose -p ${pilot} -f ${idhub_dc_f} down -v || true
         make idhub_build \
-                && docker compose -f ${idhub_dc_f} up ${detach:-}
+                && docker compose -p ${pilot} -f ${idhub_dc_f} up ${detach:-}
 }
 
 main "${@}"
diff --git a/build__pilot-xo9b.sh b/build__pilot-xo9b.sh
index b0d7b09..9e5a31f 100755
--- a/build__pilot-xo9b.sh
+++ b/build__pilot-xo9b.sh
@@ -20,9 +20,9 @@ main() {
                 git checkout pilot-xo9b
         )
 
-        postfix='pilot-xo9b'
-        local idhub1="idhub1__${postfix}"
-        local idhub2="idhub2__${postfix}"
+        pilot='pilot-xo9b'
+        local idhub1="idhub1__${pilot}"
+        local idhub2="idhub2__${pilot}"
 
         # force recreate
         rm -rf "./${idhub1}" "./${idhub2}"
@@ -36,10 +36,10 @@ main() {
                 rm -f "${idhub2}/db.sqlite3"
         fi
 
-        idhub_dc_f="docker-compose__${postfix}.yml"
-        docker compose -f ${idhub_dc_f} down -v || true
+        idhub_dc_f="docker-compose__${pilot}.yml"
+        docker compose -p ${pilot} -f ${idhub_dc_f} down -v || true
         make idhub_build \
-                && docker compose -f ${idhub_dc_f} up ${detach:-}
+                && docker compose -p ${pilot} -f ${idhub_dc_f} up ${detach:-}
 }
 
 main "${@}"