diff --git a/deploy_scripts/cloudinit.yml b/deploy_scripts/cloudinit.yml index f00dcfe79ee557ce309b4a68bbe42bf0b7358f40..ee04ba599268d3e2fddb9b8f33e5fa6766479ea8 100644 --- a/deploy_scripts/cloudinit.yml +++ b/deploy_scripts/cloudinit.yml @@ -51,5 +51,6 @@ runcmd: - 'git clone https://gitlab.jsc.fz-juelich.de/rybicki1/datacatalog.git /home/apiserver/datacatalog' - docker network create net # general startup takes long enough that no delay should bee needed - 5 to 6 minutes until these commands are executed - - 'export API_URL=https://zam10036.zam.kfa-juelich.de/' + - 'export API_URL=https://datacatalog.fz-juelich.de/' + - 'export SERVER_DOMAIN=datacatalog.fz-juelich.de' - /bin/bash /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog \ No newline at end of file diff --git a/deploy_scripts/deployment.sh b/deploy_scripts/deployment.sh index 984d9cbe526db2f9af6cc0405b6120a702842572..778bc88b63619f7ea0a293925a15827cda279bb6 100644 --- a/deploy_scripts/deployment.sh +++ b/deploy_scripts/deployment.sh @@ -8,11 +8,14 @@ git pull --all if [ -z "$CHECKOUT_TAG" ]; then export CHECKOUT_TAG=master; fi git checkout $CHECKOUT_TAG if [ -z "$API_URL" ]; then export API_URL=https://datacatalog.fz-juelich.de/; fi +if [ -z "$SERVER_DOMAIN" ]; then export SERVER_DOMAIN=datacatalog.fz-juelich.de; fi pip install -r requirements.txt python3 frontend/createStatic.py -u $API_URL +sed -i "s_datacatalog.fz-juelich.de_${SERVER_DOMAIN}_g" docker-compose.yml + # it is at this point assumed that ip and volume are correctly assigned, and that dns is working properly nohup docker-compose up >/app/mnt/docker.log & # or similar to capture docker log TODO