OSB-45: included matplotlib

.gitattributes

@@ -1900,8 +1900,12 @@ LCU/Maintenance/DBInterface/test/models/t_wincc_models.sh -text
 LCU/Maintenance/DBInterface/test/models/test_rtsm_models.py -text
 LCU/Maintenance/DBInterface/test/models/test_wincc_models.py -text
 LCU/Maintenance/DBInterface/test/postgres_testrunner.py -text
+LCU/Maintenance/Docker/BackgroundWorkers/Dockerfile -text
+LCU/Maintenance/Docker/BackgroundWorkers/entrypoint.sh -text
 LCU/Maintenance/Docker/BaseMaintenance/Dockerfile -text
 LCU/Maintenance/Docker/DBInterface/Dockerfile -text
+LCU/Maintenance/Docker/NginxProxy/Dockerfile -text
+LCU/Maintenance/Docker/NginxProxy/nginx.conf -text
 LCU/Maintenance/Docker/RESTService/Dockerfile -text
 LCU/Maintenance/Docker/RESTService/entrypoint.sh -text
 LCU/Maintenance/Docker/docker-compose.yml -text

LCU/Maintenance/Docker/BackgroundWorkers/Dockerfile

+FROM lofar-maintenance-base
+COPY --from=lofar-maintenance-dbinterface /opt/lofar/ /opt/lofar
+
+COPY ./entrypoint.sh /root/
+
+SHELL ["/bin/bash"]
+
+ENTRYPOINT /root/entrypoint.sh
+
+ENV N_WORKERS=1
\ No newline at end of file

LCU/Maintenance/Docker/BackgroundWorkers/entrypoint.sh

+#!/usr/bin/env bash
+
+source /opt/lofar/lofarinit.sh

LCU/Maintenance/Docker/BaseMaintenance/Dockerfile

@@ -11,4 +11,6 @@ RUN pip3 install beautifultable==0.7.0 \
                  django-coreapi==2.3 \
                  django-filter==2.1 \
                  inotify==0.2.10 \
+                 matplotlib==3.1.0 \
                  requests==2.22
+

LCU/Maintenance/Docker/NginxProxy/Dockerfile

+FROM lofar-maintenance-restservice as django_staticfiles_source
+
+RUN source /opt/lofar/lofarinit.sh && \
+    mkdir -p /opt/lofar/var/www && \
+    cd /opt/lofar/var/www && \
+    python3 /opt/lofar/lib64/python3.6/site-packages/lofar/maintenance/manage.py collectstatic
+
+FROM nginx:1.16.0
+COPY --from=django_staticfiles_source /opt/lofar/var/www/ /opt/lofar/var/www/
+COPY nginx.conf /etc/nginx/conf.d/default.conf
\ No newline at end of file

LCU/Maintenance/Docker/NginxProxy/nginx.conf

+server {
+    listen 80;
+    server_name _;
+
+    location /api {
+        proxy_pass http://lofar-maintenance-restservice:8000;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location /static {
+        root /opt/lofar/var/www/;
+    }
+}

LCU/Maintenance/Docker/RESTService/Dockerfile

-FROM lofar-maintenance-dbinterface
-
+FROM lofar-maintenance-base
+COPY --from=lofar-maintenance-dbinterface /opt/lofar/ /opt/lofar
 
 RUN pip3.6 install gunicorn==19.9.0 \
                    gevent \
                    django-silk==3.0.2
 
-COPY LCU/Maintenance/Docker/RESTService/entrypoint.sh /root/
+COPY ./entrypoint.sh /root/
 
-SHELL ["/bin/bash"]
+SHELL ["/bin/sh", "-c"]
 
 ENTRYPOINT /root/entrypoint.sh
 
-ENV N_WORKERS=1
\ No newline at end of file
+ENV N_WORKERS=1

LCU/Maintenance/Docker/RESTService/entrypoint.sh

 #!/usr/bin/env bash
 
 source /opt/lofar/lofarinit.sh
-gunicorn -w $N_WORKERS -k gevent lofar.maintenance.django_postgresql.wsgi:application $@
\ No newline at end of file
+gunicorn -w $N_WORKERS -k gevent lofar.maintenance.django_postgresql.wsgi:application -b 0.0.0.0:8000 $@
\ No newline at end of file

LCU/Maintenance/Docker/docker-compose.yml

@@ -4,10 +4,47 @@ services:
   lofar-maintenance-base:
     image: lofar-maintenance-base
     build:
-      context: ../../../
-      dockerfile: LCU/Maintenance/Docker/BaseMaintenance/Dockerfile
+      context: BaseMaintenance
+      dockerfile: Dockerfile
+
   lofar-maintenance-dbinterface:
     image: lofar-maintenance-dbinterface
     build:
       context: ../../../
-      dockerfile: LCU/Maintenance/Docker/DBInterface/Dockerfile
\ No newline at end of file
+      dockerfile: LCU/Maintenance/Docker/DBInterface/Dockerfile
+
+  lofar-maintenance-restservice:
+    image: lofar-maintenance-restservice
+    #links:
+    #  - lofar-maintenance-backgroundworkers
+    expose:
+      - 8000
+    build:
+      context: RESTService/
+      dockerfile: Dockerfile
+    volumes:
+      - /home/mmancini/.lofar/dbcredentials/:/root/.lofar/dbcredentials:ro
+    networks:
+      - back
+
+  lofar-maintenance-backgroundworkers:
+    image: lofar-maintenance-backgroundworkers
+    build:
+      context: BackgroundWorkers
+      dockerfile: Dockerfile
+
+  lofar-maintenance-nginx-proxy:
+    image: lofar-maintenance-nginxproxy
+    ports:
+      - 8888:80
+    build:
+      context: NginxProxy
+      dockerfile: Dockerfile
+    links:
+      - lofar-maintenance-restservice
+    networks:
+      - back
+
+networks:
+    back:
+        driver: bridge