From 6069fb75dd2502da09c9bb105e4c2530d47ab80b Mon Sep 17 00:00:00 2001
From: Christian Boettcher <c.boettcher@fz-juelich.de>
Date: Thu, 5 Aug 2021 08:50:48 +0200
Subject: [PATCH] create needed docker network, run everything with full paths,
install reqs, fix mount dir for testing server
---
deploy_scripts/cloudinit.yml | 7 ++++---
deploy_scripts/deployment.sh | 3 +++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/deploy_scripts/cloudinit.yml b/deploy_scripts/cloudinit.yml
index 5646c3c..f00dcfe 100644
--- a/deploy_scripts/cloudinit.yml
+++ b/deploy_scripts/cloudinit.yml
@@ -47,8 +47,9 @@ users:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDQMbfKUO3NoZspgWpzFY+SwY5Tx251oBT/F22pmnqKq3A0U1EcRooYVc11HzDmLrDTkoLSWAYPuv7I8weKqUPMlypXygu7I1kw1JoAZ4veV/TO8kBIb8+fUjD4VnD0EuU9/MD4rc0IazlInUu/5H2oDj4cj3XGoOFHAPRvo1YXF2eEbXgHcos5o52idZfvZPeWmk4wLqWUI+4q1C5o+c9xGxdWkA0Z6cErw5jSfaqIMu9GnsaPE8dDZ89vtNu8kRK97/Ax0qmJ8eLBfv3qm2HnqACRUv1MRLS/s9KsdB18DV6dTn8VuErJsn9rlpx/2oEMVS5lkUSLTJHf7oNVKDtILQ/rQ2tF/f3LakmiViA4ZsWxFspP0T/sXPhjuCgEqGWG8HrJwFj8DByMpoJUsGe1czAiMdoY5Tr7UeIgK7BGaGjoVUFaVrCKlDpDNhYsHopSTTNajVxsb0LkTRIRphGlQTHlD3nDYdHIrgZiLqA1XLtTTXtWNzQ4uE59tAkIzdTK7RSBduHunqx++IEO6Huj49Vvk1vcO33iqFTTZro1vhZ2kEGxAkxNMti+/eT2rvyfkhsXaUH1/7LXvRrR+pFKcXBpaWWeEt8cOiVrMWAPDi9VRh5QPZbJ1tyTq7XzxeaQuJhL22o2BO13ZSRzr1S+UNFcmfk3esruZoxDIiQ+Bw== apiserver@gitlab
runcmd:
- - mkdir -p /app/mnt
- - 'git clone https://gitlab.jsc.fz-juelich.de/rybicki1/datacatalog.git /home/apiserver/'
+ - mkdir -p /app/mnt/data
+ - '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/'
- - /bin/bash deploy_scripts/deployment.sh /home/apiserver/datacatalog
\ No newline at end of file
+ - /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 795ff91..984d9cb 100644
--- a/deploy_scripts/deployment.sh
+++ b/deploy_scripts/deployment.sh
@@ -8,6 +8,9 @@ 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
+
+pip install -r requirements.txt
+
python3 frontend/createStatic.py -u $API_URL
# it is at this point assumed that ip and volume are correctly assigned, and that dns is working properly
--
GitLab