Refatoring docker-compose.

.dockerignore

@@ -4,8 +4,7 @@
 .vscode/
 .volumes/
 data/
-docs/
 infrastructure/
 gui/
 __pycache__/
-*.pyc
+*.pyc
\ No newline at end of file

Dockerfile

@@ -39,11 +39,13 @@ RUN python nomad/dependencies.py
 FROM final
 # transfer installed packages from dependency stage
 COPY --from=dependencies /usr/local/lib/python3.6/site-packages /usr/local/lib/python3.6/site-packages
+COPY --from=dependencies /usr/local/bin/sphinx-build /usr/local/bin/sphinx-build
 # we also need to copy the install dir, since nomad coe deps are installed with -e
 # TODO that should be changed in production!
 COPY --from=dependencies /install /install
 
 # do stuff
+RUN apt-get update && apt-get install -y make
 COPY . /app
 WORKDIR /app
 RUN pip install -e .

infrastructure/nomad-xt/.env → infrastructure/nomadxt/.env_local

@@ -6,4 +6,4 @@ MONGO_HOST_PORT=27017
 KIBANA_HOST_PORT=5601
 
 API_HOST_PORT=8000
-GUI_HOST_PORT=8005
+GUI_HOST_PORT=8005
\ No newline at end of file

infrastructure/nomad-xt/enc-processing.env → infrastructure/nomadxt/.env_processing

@@ -5,5 +5,7 @@ ELASTIC_HOST_PORT=10200
 MONGO_HOST_PORT=10017
 KIBANA_HOST_PORT=10601
 
-API_HOST_PORT=8000
-GUI_HOST_PORT=8005
+API_HOST_PORT=8083
+GUI_HOST_PORT=127.0.0.1:8003
\ No newline at end of file
+
+ELASTIC_VOLUME=nomadxt_elastic

infrastructure/nomadxt/.gitignore

+.env

infrastructure/nomad-xt/docker-compose.yml → infrastructure/nomadxt/docker-compose.yml

@@ -20,7 +20,7 @@ services:
         restart: always
         image: minio/minio:RELEASE.2018-06-08T03-49-38Z
         # image: minio/minio
-        container_name: nomad-xt-minio
+        container_name: nomadxt_minio
         ports:
             - ${MINIO_HOST_PORT}:9000
         volumes:
@@ -35,7 +35,7 @@ services:
     rabbitmq:
         restart: always
         image: rabbitmq
-        container_name: nomad-xt-rabbitmq
+        container_name: nomadxt_rabbitmq
         environment:
             - RABBITMQ_ERLANG_COOKIE=SWQOKODSQALRPCLNMEQG
             - RABBITMQ_DEFAULT_USER=rabbitmq
@@ -47,7 +47,7 @@ services:
     # results backend for celery
     redis:
         image: redis:3.0-alpine
-        container_name: nomad-xt-redis
+        container_name: nomadxt_redis
         command: redis-server --appendonly yes
         volumes:
             - ../../.volumes/redis:/data
@@ -57,16 +57,15 @@ services:
     # the search engine
     elastic:
         image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
-        container_name: nomad-xt-elastic
         volumes:
-            - ../../.volumes/elastic:/usr/share/elasticsearch/data
+            - nomadxt_elastic:/usr/share/elasticsearch/data
         ports:
             - ${ELASTIC_HOST_PORT}:9200
 
     # the user data db
     mongo:
         image: mongo:latest
-        container_name: nomad-xt-mongo
+        container_name: nomadxt_mongo
         environment:
           - MONGO_DATA_DIR=/data/db
           - MONGO_LOG_DIR=/dev/null
@@ -80,7 +79,7 @@ services:
     elk:
         restart: always
         build: ../elk/
-        container_name: nomad-xt-elk
+        container_name: nomadxt_elk
         expose:
             - 5000 # logstash beats
             - 5044 # logstash tcp
@@ -90,7 +89,6 @@ services:
     # nomad processing worker
     worker:
         build: ../../
-        container_name: nomad-xt-worker
         environment:
             - NOMAD_MINIO_PORT=9000
             - NOMAD_MINIO_HOST=minio
@@ -158,4 +156,7 @@ services:
         links:
             - api
         ports:
-            - ${GUI_HOST_PORT}:80
+            - ${GUI_HOST_PORT}:80
\ No newline at end of file
+
+volumes:
+    nomadxt_elastic:

requirements.Dockerfile

@@ -24,4 +24,4 @@ WORKDIR /install
 COPY requirements.txt requirements.txt
 COPY requirements-dep.txt requirements-dep.txt
 RUN pip install -r requirements.txt
-RUN pip install -r requirements-dep.txt
+RUN pip install -r requirements-dep.txt
\ No newline at end of file