Merge pull request #83 from alan-turing-institute/feature-json-config

Add manager json config mechanism and refactor openfoam demo cases

.travis.yml

@@ -14,8 +14,8 @@ matrix:
 
 before_install:
  - git submodule update --init --recursive
- - cp gateway-openfoam/gateway-job-manager-openfoam/config.py.example gateway-openfoam/gateway-job-manager-openfoam/config.py
+ - cp gateway-openfoam/gateway-job-manager-openfoam/config.example.json gateway-openfoam/gateway-job-manager-openfoam/config.development.json
  - (cd gateway-openfoam/gateway-job-manager-openfoam/keys && ./create_keys.sh)
- 
+
 install:
  - docker-compose build

README.md

@@ -45,7 +45,7 @@ This repository is for managing project-level issues. See separate repositories
 
     ```shell
     (cd gateway-openfoam/gateway-job-manager-openfoam && cp config.py.example config.py)
-    (cd gateway-auth && cp config.py.example config.py)
+    (cd gateway-auth && cp config.example.json config.development.json)
     ```
 
 1. Bring up the full system.

docker-compose.yml

@@ -1,5 +1,6 @@
 version: '3'
 services:
+
   middleware:
     build:
       context: gateway-middleware
@@ -30,11 +31,11 @@ services:
     ports:
      - "5050:5050"
     volumes:
-     - ./gateway-auth:/app
+      - ./gateway-auth:/app
     depends_on:
-     - postgres_auth
+      - postgres_auth
     networks:
-     - db_nw
+      - db_nw
 
   postgres_auth:
     image: "postgres:latest"
@@ -52,14 +53,14 @@ services:
       context: gateway-openfoam/gateway-job-manager-openfoam
       dockerfile: Dockerfile
     ports:
-    - "5001:5001"
-    - "10023:22"
+      - "5001:5001"
+      - "10023:22"
     volumes:
-    - ./gateway-openfoam/gateway-job-manager-openfoam:/app
+      - ./gateway-openfoam/gateway-job-manager-openfoam:/app
     environment:
-    - FLASK_CONFIGURATION=default
-    - azure_account_name
-    - azure_account_key
+      - FLASK_CONFIGURATION=development
+      - STORAGE_ACCOUNT_NAME
+      - STORAGE_ACCOUNT_KEY
     depends_on:
     - middleware
     - simulator

setup.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 
 echo "INFO: running postgres container"
-docker-compose run postgres &
-docker-compose run postgres_auth &
 
+echo "INFO: please wait, postgres container will shut down in 5 seconds"
+docker-compose run postgres &
+sleep 5
+docker-compose down
 
-echo "INFO: please wait, postgres and postgres_auth containers will shut down in 10 seconds"
-sleep 10
+echo "INFO: please wait, postgres_auth container will shut down in 5 seconds"
+docker-compose run postgres_auth &
+sleep 5
 docker-compose down