From 5d38f48f682065d3ec1ce70275452a57ea9da932 Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Fri, 24 Feb 2023 16:32:17 +0100 Subject: [PATCH 1/2] Add developer install --- bridgehead | 7 ++++++- lib/prepare-system.sh | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/bridgehead b/bridgehead index ecf4ec0..227a0d7 100755 --- a/bridgehead +++ b/bridgehead @@ -77,7 +77,12 @@ case "$ACTION" in exec ./lib/update-bridgehead.sh $PROJECT ;; install) - source ./lib/prepare-system.sh + source ./lib/prepare-system.sh NODEV + loadVars + exec ./lib/install-bridgehead.sh $PROJECT + ;; + dev-install) + exec ./lib/prepare-system.sh DEV loadVars exec ./lib/install-bridgehead.sh $PROJECT ;; diff --git a/lib/prepare-system.sh b/lib/prepare-system.sh index 8cacdf0..765c6d3 100755 --- a/lib/prepare-system.sh +++ b/lib/prepare-system.sh @@ -1,5 +1,7 @@ #!/bin/bash -e +DEV_MODE="${1:-NODEV}" + source lib/log.sh source lib/functions.sh @@ -55,7 +57,7 @@ if [ -d /etc/bridgehead ]; then else log "WARN" "Your site configuration repository in /etc/bridgehead seems to have another origin than git.verbis.dkfz.de. Please check if the repository is correctly cloned!" fi -else +elif [[ "$DEV_MODE" == "NODEV" ]]; then log "INFO" "Now cloning your site configuration repository for you." read -p "Please enter your site: " site read -s -p "Please enter the bridgehead's access token for your site configuration repository (will not be echoed): " access_token @@ -64,9 +66,13 @@ else if [ $? -gt 0 ]; then log "ERROR" "Unable to clone your configuration repository. Please obtain correct access data and try again." fi +elif [[ "$DEV_MODE" == "DEV" ]]; then + log "INFO" "Now cloning your developer configuration repository for you." + read -p "Please enter your config repository URL: " url + git clone "$url" /etc/bridgehead fi chown -R bridgehead /etc/bridgehead /srv/docker/bridgehead -log INFO "System preparation is completed and private key is present." +log INFO "System preparation is completed and configuration is present." From cedc97477f3bc094cdb35daf1d6b2a8ba81513c6 Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Mon, 27 Feb 2023 13:02:59 +0100 Subject: [PATCH 2/2] Add developer install option to the documentation --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 8fba0c9..2951102 100644 --- a/README.md +++ b/README.md @@ -157,6 +157,10 @@ To keep all Bridgeheads up and working and detect any errors before a user does, In all monitoring cases, obviously no sensitive information is transmitted, in particular not any patient-related data. Aggregated data, e.g. total amount of datasets, may be transmitted for diagnostic purposes. +### Development Installation + +By using `./bridgehead dev-install ` instead of `install`, you can install a developer bridgehead. The difference is, that you can provide an arbitrary configuration repository during the installation, meaning that it does not have to adhere to the usual naming scheme. This allows for better decoupling between development and production configurations. + ## Troubleshooting ### Docker Daemon Proxy Configuration