config

.gitlab-ci.yml

@@ -56,6 +56,7 @@ build-ui:
                 - cd ui/hv2-ui
                 - if [ "$CI_COMMIT_TAG" != "" ]; then
                     sed -i -e 's/GITTAGVERSION/'"$CI_COMMIT_TAG"':'"$CI_COMMIT_SHORT_SHA"'/' ./src/app/navigation/navigation.component.html;
+                    sed -i -e 's,http://localhost:8080,https://api.hv.nober.de,' ./src/app/config.ts;
                   fi
                 - npm install
                 - ./node_modules/.bin/ng build --prod
@@ -97,6 +98,7 @@ dockerize-ui:
                 - docker rm $CONTAINER_NAME || echo "container not existing, never mind"
                 - docker run -d --network docker-server 
                                 --ip $CONTAINER_IP
+                                $VOLUMEOPT
                                 --name $CONTAINER_NAME
                                 --restart always 
                                 $IMAGE_NAME:$CI_COMMIT_TAG
@@ -107,6 +109,8 @@ deploy-api:
         variables:
                 IMAGE_NAME: ${CI_REGISTRY}/${CI_PROJECT_PATH}/api
                 CONTAINER_NAME: hv2-api
+                CONTAINER_IP: 172.16.10.38
+                VOLUMEOPT: -v hv2-api-conf:/opt/app/config
 
 deploy-ui:
         extends: 
@@ -114,3 +118,4 @@ deploy-ui:
         variables:
                 IMAGE_NAME: ${CI_REGISTRY}/${CI_PROJECT_PATH}/ui
                 CONTAINER_NAME: hv2-ui
+                CONTAINER_IP: 172.16.10.39

api/server.py

@@ -6,7 +6,13 @@ app = connexion.App(__name__)
 app.add_api('openapi.yaml')
 
 # CORSify it - otherwise Angular won't accept it
-CORS(app.app)
+CORS(app.app, 
+    origins=[
+        "http://localhost:4200",
+        "https://base.hv.nober.de"
+    ],
+    supports_credentials=True
+)
 
 # provide the webservice application to uwsgi
 application = app.app