From 2e802c09e19bc44c9b778980d0b8fd5dbd40bcbf Mon Sep 17 00:00:00 2001
From: Auke Klazema <klazema@astron.nl>
Date: Mon, 30 Aug 2021 14:32:09 +0200
Subject: [PATCH] TMSS-963: Change docker-compose to mimic new deployment
---
SAS/TMSS/docker-compose-ua.yml | 40 ++++++++++++++++++++++------------
1 file changed, 26 insertions(+), 14 deletions(-)
diff --git a/SAS/TMSS/docker-compose-ua.yml b/SAS/TMSS/docker-compose-ua.yml
index 73b699d14c9..f0d302c413a 100644
--- a/SAS/TMSS/docker-compose-ua.yml
+++ b/SAS/TMSS/docker-compose-ua.yml
@@ -7,20 +7,32 @@ 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;
+ cd /opt/lofar/lib64/python3.6/site-packages/lofar/sas/tmss/;
+ python3 manage.py migrate;
+ python3 manage.py collectstatic;
+ gunicorn lofar.sas.tmss.tmss.wsgi --worker-class=gevent --workers=4 --bind=0.0.0.0:8001'"
+ depends_on:
+ - rabbitmq
+ nginx:
+ 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
--
GitLab