Merge branch 'dev' into 'master'

Automatize docker-compose

See merge request !6

.gitmodules

+[submodule "fda-ui"]
+	path = fda-ui
+	url = git@gitlab.phaidra.org:fair-data-austria-db-repository/fda-ui.git
+	branch = master

README.md

-# fda-services (java)
+# FAIR Data Austria Services
 
-## Build Setup
+### Build
 
-Create the database container image:
+Everything is handled by compose, just build it by running:
 
-    cd fda-container-managing-service/rest-service/src/main/resources
-    docker build --tag rdr-postgres:1.0 .
+```bash
+docker-compose build
+```
+
+### Start
+
+Now start all services by running:
 
 ```bash
-# First generate jars for discovery,gateway,database,container and query services
-$ mvn clean install
+docker-compose up fda-discovery-server fda-gateway-service fda-database-managing-service fda-container-managing-service fda-query-service fda-table-service fda-analyse-service
+```
 
-# start application
-$ docker-compose up --build #(use -d for detach mode)
+Optionally, start the user interface by running:
 
-# stop application
-$ docker-compose down
+```bash
+docker-compose up fda-ui
 ```
\ No newline at end of file

docker-compose.yml

 version: "3.6"
+
 services:
+
   fda-discovery-server:
     container_name: fda-discovery-server
-        build:
-            context: ./fda-discovery-server
-        image: fda-discovery-server:latest
+    build: ./fda-discovery-server
+    image: fda-discovery-server
     network_mode: bridge
     expose:
       - 9090
     ports:
       - 9090:9090
+
   fda-gateway-service:
     container_name: fda-gateway-service
-        build:
-            context: ./fda-gateway-service
-        image: fda-gateway-service:latest
+    build: ./fda-gateway-service
+    image: fda-gateway-service
     network_mode: bridge
     environment:
       - eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka
@@ -36,15 +37,15 @@ services:
       - fda-table-service
     logging:
       driver: json-file
+
   fda-database-managing-service:
     container_name: fda-database-managing-service
     build:
       context: ./fda-database-managing-service
-        image: fda-database-managing-service:latest
+    image: fda-database-managing-service
     network_mode: bridge
     environment:
       - eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka
-       
     expose:
       - 9092
     ports:
@@ -60,9 +61,8 @@ services:
 
   fda-container-managing-service:
     container_name: fda-container-managing-service
-        build:
-            context: ./fda-container-managing-service
-        image: fda-container-managing-service:latest
+    build: ./fda-container-managing-service
+    image: fda-container-managing-service
     network_mode: bridge
     environment:
       - eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka
@@ -78,11 +78,11 @@ services:
       - fda-discovery-server
     logging:
       driver: json-file
+
   fda-query-service:
     container_name: fda-query-service
-        build:
-            context: ./fda-query-service
-        image: fda-query-service:latest
+    build: ./fda-query-service
+    image: fda-query-service
     network_mode: bridge
     environment:
       - eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka
@@ -100,11 +100,11 @@ services:
       - fda-container-managing-service
     logging:
       driver: json-file
+
   fda-table-service:
     container_name: fda-table-service
-        build:
-            context: ./fda-table-service
-        image: fda-table-service:latest
+    build: ./fda-table-service
+    image: fda-table-service
     network_mode: bridge
     environment:
       - eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka
@@ -121,11 +121,11 @@ services:
       - fda-analyse-service
     depends_on:
       - fda-discovery-server
+
   fda-analyse-service:
     container_name: fda-analyse-service
-        build:
-            context: ./analyse-service
-        image: analyse-service:latest
+    build: ./fda-analyse-service
+    image: analyse-service
     network_mode: bridge
     command: sh -c "/wait && flask run"
     environment:
@@ -146,3 +146,21 @@ services:
       - fda-discovery-server
     logging:
       driver: json-file
+
+  fda-ui:
+    container_name: fda-ui
+    build: ../fda-ui
+    image: fda-ui
+    expose:
+      - 3000
+    ports:
+      - 3000:3000
+    links:
+      - fda-discovery-server
+      - fda-container-managing-service
+      - fda-query-service
+      - fda-analyse-service
+    depends_on:
+      - fda-discovery-server
+    environment:
+      HOST: 0.0.0.0

analyse-service/Dockerfile → fda-analyse-service/Dockerfile

 FROM python:3.8-slim
+MAINTAINER Cornelia Michlits <cornelia.michlits@tuwien.ac.at>
+
 ENV FLASK_APP=app.py
 ENV FLASK_RUN_HOST=0.0.0.0
-RUN apt-get update
-RUN apt-get install -y libxml2-dev libxslt-dev python-lxml gcc
+
+RUN apt-get update > /dev/null
+RUN apt-get install -y libxml2-dev libxslt-dev python-lxml gcc > /dev/null
+
 COPY requirements.txt requirements.txt
-RUN pip install -r requirements.txt
+
+RUN pip install -r requirements.txt > /dev/null
+
 # Add docker-compose-wait tool -------------------
 ENV WAIT_VERSION 2.7.2
+
 ADD https://github.com/ufoscout/docker-compose-wait/releases/download/$WAIT_VERSION/wait /wait
+
 RUN chmod +x /wait
+
 COPY . .
+
 EXPOSE 5000
+
 CMD ["flask", "run"]
\ No newline at end of file