fix docker project namespaces

This commit is contained in:
pedro 2024-01-16 11:19:55 +01:00
parent 1cc0cdc4d9
commit 00360491ec
3 changed files with 18 additions and 18 deletions

View File

@ -20,23 +20,23 @@ main() {
git checkout pilot-lafede git checkout pilot-lafede
) )
postfix='pilot-lafede' pilot='pilot-lafede'
local idhub1="idhub1__${postfix}" local idhub1="idhub1__${pilot}"
# force recreate # force recreate
rm -rf "./${idhub1}" rm -rf "./${idhub1}"
# detect if is new # detect if is new
if [ ! -f "./${idhub1}" ]; then 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}" cp -rp IdHub "${idhub1}"
rm -f "${idhub1}/db.sqlite3" rm -f "${idhub1}/db.sqlite3"
fi fi
idhub_dc_f="docker-compose__${postfix}.yml" idhub_dc_f="docker-compose__${pilot}.yml"
docker compose -f ${idhub_dc_f} down -v || true docker compose -p ${pilot} -f ${idhub_dc_f} down -v || true
make idhub_build \ make idhub_build \
&& docker compose -f ${idhub_dc_f} up ${detach:-} && docker compose -p ${pilot} -f ${idhub_dc_f} up ${detach:-}
} }
main "${@}" main "${@}"

View File

@ -20,9 +20,9 @@ main() {
git checkout pilot-setem git checkout pilot-setem
) )
postfix='pilot-setem' pilot='pilot-setem'
local idhub1="idhub1__${postfix}" local idhub1="idhub1__${pilot}"
local idhub2="idhub2__${postfix}" local idhub2="idhub2__${pilot}"
# force recreate # force recreate
rm -rf "./${idhub1}" "./${idhub2}" rm -rf "./${idhub1}" "./${idhub2}"
@ -36,10 +36,10 @@ main() {
rm -f "${idhub2}/db.sqlite3" rm -f "${idhub2}/db.sqlite3"
fi fi
idhub_dc_f="docker-compose__${postfix}.yml" idhub_dc_f="docker-compose__${pilot}.yml"
docker compose -f ${idhub_dc_f} down -v || true docker compose -p ${pilot} -f ${idhub_dc_f} down -v || true
make idhub_build \ make idhub_build \
&& docker compose -f ${idhub_dc_f} up ${detach:-} && docker compose -p ${pilot} -f ${idhub_dc_f} up ${detach:-}
} }
main "${@}" main "${@}"

View File

@ -20,9 +20,9 @@ main() {
git checkout pilot-xo9b git checkout pilot-xo9b
) )
postfix='pilot-xo9b' pilot='pilot-xo9b'
local idhub1="idhub1__${postfix}" local idhub1="idhub1__${pilot}"
local idhub2="idhub2__${postfix}" local idhub2="idhub2__${pilot}"
# force recreate # force recreate
rm -rf "./${idhub1}" "./${idhub2}" rm -rf "./${idhub1}" "./${idhub2}"
@ -36,10 +36,10 @@ main() {
rm -f "${idhub2}/db.sqlite3" rm -f "${idhub2}/db.sqlite3"
fi fi
idhub_dc_f="docker-compose__${postfix}.yml" idhub_dc_f="docker-compose__${pilot}.yml"
docker compose -f ${idhub_dc_f} down -v || true docker compose -p ${pilot} -f ${idhub_dc_f} down -v || true
make idhub_build \ make idhub_build \
&& docker compose -f ${idhub_dc_f} up ${detach:-} && docker compose -p ${pilot} -f ${idhub_dc_f} up ${detach:-}
} }
main "${@}" main "${@}"