Merge branch 'master' into TMSS-847

.gitlab-ci.yml

@@ -465,8 +465,8 @@ deploy-tmss-ua:
     - cd SAS/TMSS
     - ssh lofarsys@tmss-ua.control.lofar "docker-compose -f docker-compose-ua.yml down"
     - scp docker-compose-ua.yml lofarsys@tmss-ua.control.lofar:~/
-    - ssh lofarsys@tmss-ua.control.lofar "docker pull ${CI_NEXUS_REGISTRY}/tmss_django:$CI_COMMIT_SHORT_SHA"
-    - ssh lofarsys@tmss-ua.control.lofar "docker tag ${CI_NEXUS_REGISTRY}/tmss_django:$CI_COMMIT_SHORT_SHA ${CI_NEXUS_REGISTRY}/tmss_django:latest"
+    - ssh lofarsys@tmss-ua.control.lofar "docker pull ${CI_NEXUS_REGISTRY_LOCATION}/tmss_django:$CI_COMMIT_SHORT_SHA"
+    - ssh lofarsys@tmss-ua.control.lofar "docker tag ${CI_NEXUS_REGISTRY_LOCATION}/tmss_django:$CI_COMMIT_SHORT_SHA ${CI_NEXUS_REGISTRY_LOCATION}/tmss_django:latest"
     - ssh lofarsys@tmss-ua.control.lofar "docker-compose -f docker-compose-ua.yml up -d"
   needs:
     - dockerize_TMSS

SAS/TMSS/docker-compose-ua.yml

@@ -7,20 +7,29 @@ services:
     ports:
       - 5672:5672
       - 15672:15672
-  oidc-provider:
-    image: nexus.cep4.control.lofar:18080/tmss_testprovider:latest
-    restart: unless-stopped
-    hostname: oidc-provider
+  django:
+    image: git.astron.nl:5000/ro/lofar/tmss_django:latest
+    container_name: django-gunicorn
+    restart: always
+    volumes:
+      - static_volume:/opt/lofar/staticfiles
     env_file:
-      - ./.env
-    ports:
-      - "8088:8088"
-  web:
-    image: nexus.cep4.control.lofar:18080/tmss_django:latest
-    hostname: tmss-ua
-    restart: on-failure
-    env_file:
-      - ./.env
-    command: bash -c 'source /opt/lofar/lofarinit.sh && ALLOWED_HOSTS=* tmss_test_environment -H 0.0.0.0 -P tmss-ua -p 8008 --data'
+      - ~/.lofar/.env
+    command:
+      "/bin/bash -c 'source lofarinit.sh;
+                     gunicorn lofar.sas.tmss.tmss.wsgi --worker-class=gevent --workers=4 --bind=0.0.0.0:8001'"
+    depends_on:
+      - rabbitmq
+  tmss-ua.control.lofar:
+    image: nginx:1.17
+    container_name: ngx
     ports:
       - "8008:8008"
+    volumes:
+      - static_volume:/opt/lofar/staticfiles
+      - ~/.lofar/etc/nginx:/etc/nginx/conf.d
+    depends_on:
+      - django
+
+volumes:
+  static_volume:
\ No newline at end of file