From 3023b82bb164a99d331f86a113418e6c78b90895 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Tue, 21 Feb 2023 09:26:53 +0100 Subject: [PATCH 1/4] Switch beam images to develop tag --- bbmri/docker-compose.yml | 2 +- ccp/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bbmri/docker-compose.yml b/bbmri/docker-compose.yml index 3291326..89ed1a9 100644 --- a/bbmri/docker-compose.yml +++ b/bbmri/docker-compose.yml @@ -85,7 +85,7 @@ services: - "blaze" beam-proxy: - image: samply/beam-proxy:main + image: samply/beam-proxy:develop container_name: bridgehead-beam-proxy environment: BROKER_URL: ${BROKER_URL} diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 4c26d5e..65e57d2 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -85,7 +85,7 @@ services: - "blaze" beam-proxy: - image: samply/beam-proxy:main + image: samply/beam-proxy:develop container_name: bridgehead-beam-proxy environment: BROKER_URL: ${BROKER_URL} From 2dc36433bf38527970160942e793cfc21a91e6d3 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Thu, 23 Feb 2023 14:26:59 +0100 Subject: [PATCH 2/4] Fixed naming of site in exliquid script --- ccp/exliquid-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccp/exliquid-setup.sh b/ccp/exliquid-setup.sh index 83daa45..91909eb 100644 --- a/ccp/exliquid-setup.sh +++ b/ccp/exliquid-setup.sh @@ -2,7 +2,7 @@ function exliquidSetup() { case ${SITE_ID} in - berlin|dresden|essen|frankfurt|freiburg|luebeck|mainz|muenchen-lmu|muenchen-tu|mannheim|tuebingen) + berlin|dresden|essen|frankfurt|freiburg|luebeck|mainz|muenchen-lmu|muenchen-tum|mannheim|tuebingen) EXLIQUID=1 ;; dktk-test) From 8b2e99200ed0586faf6ed7e7df229908c9809072 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Thu, 23 Feb 2023 18:05:34 +0100 Subject: [PATCH 3/4] Fix typo --- lib/prepare-system.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/prepare-system.sh b/lib/prepare-system.sh index 2cba2e2..f54ee07 100755 --- a/lib/prepare-system.sh +++ b/lib/prepare-system.sh @@ -26,7 +26,7 @@ if [ -d "/srv/docker/bridgehead" ]; then else log "INFO" "Cloning $bridgehead_repository_url to /srv/docker/bridgehead" mkdir -p /srv/docker/ - git clone bridgehead_repository_url /srv/docker/bridgehead + git clone $bridgehead_repository_url /srv/docker/bridgehead fi case "$PROJECT" in From 857e351b884b11d123d4516e4fadea04f893addb Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Thu, 23 Feb 2023 18:05:53 +0100 Subject: [PATCH 4/4] Support gitmirror for github.com repo --- lib/prepare-system.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/prepare-system.sh b/lib/prepare-system.sh index f54ee07..8cacdf0 100755 --- a/lib/prepare-system.sh +++ b/lib/prepare-system.sh @@ -14,7 +14,12 @@ else fi # Clone the OpenSource repository of bridgehead -bridgehead_repository_url="https://github.com/samply/bridgehead.git" +set +e +bridgehead_repository_url=$(git remote get-url origin) +if [ $? -ne 0 ]; then + bridgehead_repository_url="https://github.com/samply/bridgehead.git" +fi +set -e if [ -d "/srv/docker/bridgehead" ]; then current_owner=$(stat -c '%U' /srv/docker/bridgehead) if [ "$(su -c 'git -C /srv/docker/bridgehead remote get-url origin' $current_owner)" == "$bridgehead_repository_url" ]; then