Refs #6

- Hostnames for each component added
- README cleanup
- hystrix-dashboard Dockerfile added
- fda-gateway needs a different implementatin of CORS (reports MVC not compatible with Spring Web on runtime)
- fda-analyse needs some production-grade Dockerfile, currently only dev-server

README.md

 # FAIR Data Austria Services
 
-### Build
+## Build
 
 Everything is handled by compose, just build it by running:
 
@@ -8,18 +8,12 @@ Everything is handled by compose, just build it by running:
 docker-compose build
 ```
 
-### Start
+## Start
 
 Now start all services by running:
 
 ```bash
-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
-```
-
-Optionally, start the user interface by running:
-
-```bash
-docker-compose up fda-ui
+docker-compose up
 ```
 
 ### Troubleshooting
@@ -35,14 +29,26 @@ WARNING: Illegal reflective access by com.google.inject.internal.cglib.core.$Ref
 
 Install maven from Apache Org.:
 
-# Download maven e.g. 3.6.3
+Download maven e.g. 3.6.3
+
+```bash
 wget https://www-us.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -P /tmp
+```
+
+Untar downloaded file to /opt
 
-# Untar downloaded file to /opt
+```bash
 sudo tar xf /tmp/apache-maven-*.tar.gz -C /opt
+```
 
-# Install the alternative version for the mvn in your system
+Install the alternative version for the mvn in your system
+
+```bash
 sudo update-alternatives --install /usr/bin/mvn mvn /opt/apache-maven-3.6.3/bin/mvn 363
+```
+
+Check if your configuration is ok. You may use your current or the 3.6.3 whenever you wish, running the command below.
 
-# Check if your configuration is ok. You may use your current or the 3.6.3 whenever you wish, running the command below.
+```bash
 sudo update-alternatives --config mvn
+```

docker-compose.yml

@@ -4,6 +4,7 @@ services:
 
   fda-discovery-server:
     container_name: fda-discovery-server
+    hostname: fda-discovery-server
     build: ./fda-discovery-server
     image: fda-discovery-server
     environment:
@@ -16,6 +17,7 @@ services:
 
   fda-gateway-service:
     container_name: fda-gateway-service
+    hostname: fda-gateway-service
     build: ./fda-gateway-service
     image: fda-gateway-service
     network_mode: bridge
@@ -42,6 +44,7 @@ services:
 
   fda-database-managing-service:
     container_name: fda-database-managing-service
+    hostname: fda-database-managing-service
     build:
       context: ./fda-database-managing-service
     image: fda-database-managing-service
@@ -63,6 +66,7 @@ services:
 
   fda-container-managing-service:
     container_name: fda-container-managing-service
+    hostname: fda-container-managing-service
     build: ./fda-container-managing-service
     image: fda-container-managing-service
     network_mode: bridge
@@ -83,6 +87,7 @@ services:
 
   fda-query-service:
     container_name: fda-query-service
+    hostname: fda-query-service
     build: ./fda-query-service
     image: fda-query-service
     network_mode: bridge
@@ -105,6 +110,7 @@ services:
 
   fda-table-service:
     container_name: fda-table-service
+    hostname: fda-table-service
     build: ./fda-table-service
     image: fda-table-service
     network_mode: bridge
@@ -126,6 +132,7 @@ services:
 
   fda-analyse-service:
     container_name: fda-analyse-service
+    hostname: fda-analyse-service
     build: ./fda-analyse-service
     image: analyse-service
     network_mode: bridge
@@ -151,6 +158,7 @@ services:
 
   fda-ui:
     container_name: fda-ui
+    hostname: fda-ui
     build: ./fda-ui
     image: fda-ui
     expose:

fda-analyse-service/Dockerfile

@@ -22,4 +22,5 @@ COPY . .
 
 EXPOSE 5000
 
+# TODO on runtime displays: "WARNING: This is a development server. Do not use it in a production deployment."
 CMD ["flask", "run"]
\ No newline at end of file

fda-container-managing-service/Dockerfile

@@ -7,8 +7,6 @@ COPY ./rest-service ./rest-service
 COPY ./services ./services
 COPY ./pom.xml ./
 
-ENV SPRING_MAIN_BANNER-MODE=off
-
 RUN mvn -fn -B dependency:go-offline > /dev/null
 
 RUN mvn -q clean package > /dev/null

fda-container-managing-service/rest-service/src/main/resources/application-docker.properties

 server.port=9091
 spring.application.name=fda-container-managing
 spring.main.banner-mode=off
-logging.level.=warn
+logging.level.root=warn
 logging.level.at.=info
-logging.level.pattern.console=%d %highlight(%-5level): %msg%n
 eureka.instance.hostname=fda-container-managing
 eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka/
 eureka.instance.preferIpAddress=true
\ No newline at end of file

fda-database-managing-service/Dockerfile

@@ -8,8 +8,6 @@ COPY ./rest-service ./rest-service
 COPY ./services ./services
 COPY ./pom.xml ./
 
-ENV SPRING_MAIN_BANNER-MODE=off
-
 RUN mvn -fn -B dependency:go-offline > /dev/null
 
 RUN mvn -q clean package > /dev/null

fda-database-managing-service/rest-service/src/main/resources/application-docker.properties

 server.port=9092
 spring.application.name=fda-database-managing
 spring.main.banner-mode=off
-logging.level.=warn
+logging.level.root=warn
 logging.level.at.=info
-logging.level.pattern.console=%d %highlight(%-5level): %msg%n
 eureka.instance.hostname=fda-database-managing
 eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka/
 eureka.instance.preferIpAddress=true
\ No newline at end of file

fda-discovery-server/src/main/resources/application-docker.properties

 server.port=9090
 spring.application.name=fda-discovery-server
 spring.main.banner-mode=off
-logging.level.=warn
+logging.level.root=warn
 logging.level.at.=info
-logging.level.pattern.console=%d %highlight(%-5level): %msg%n
 eureka.client.register-with-eureka=false
 eureka.client.fetch-registry=false
 eureka.instance.hostname=fda-discovery-server

fda-gateway-service/src/main/resources/application-docker.properties

 server.port=9095
 spring.application.name=fda-gateway-service
 spring.main.banner-mode=off
-logging.level.=warn
+logging.level.root=warn
 logging.level.at.=info
-logging.level.pattern.console=%d %highlight(%-5level): %msg%n
-eureka.client.register-with-eureka=false
-eureka.client.fetch-registry=false
+logging.pattern.console="%d %highlight(%-5level): %msg%n"
 eureka.instance.hostname=fda-gateway-service
 eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka/
\ No newline at end of file
-eureka.instance.preferIpAddress=true
\ No newline at end of file

fda-query-service/Dockerfile

@@ -9,8 +9,6 @@ COPY ./rest-service ./rest-service
 COPY ./services ./services
 COPY ./pom.xml ./
 
-ENV SPRING_MAIN_BANNER-MODE=off
-
 RUN mvn -fn -B dependency:go-offline > /dev/null
 
 RUN mvn -q clean package > /dev/null

fda-query-service/rest-service/src/main/resources/application-docker.properties

 server.port=9093
 spring.application.name=fda-query-service
 spring.main.banner-mode=off
-logging.level.=warn
+logging.level.root=warn
 logging.level.at.=info
-logging.level.pattern.console=%d %highlight(%-5level): %msg%n
 eureka.instance.hostname=fda-query-service
 eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka/
-eureka.instance.preferIpAddress=true
\ No newline at end of file

fda-table-service/Dockerfile

@@ -8,8 +8,6 @@ COPY ./rest-service ./rest-service
 COPY ./services ./services
 COPY ./pom.xml ./
 
-ENV SPRING_MAIN_BANNER-MODE=off
-
 RUN mvn -fn -B dependency:go-offline > /dev/null
 
 RUN mvn -q clean package > /dev/null

fda-table-service/rest-service/src/main/resources/application-docker.properties

 server.port=9094
 spring.application.name=fda-table-service
 spring.main.banner-mode=off
-logging.level.=warn
+logging.level.root=warn
 logging.level.at.=info
-logging.level.pattern.console=%d %highlight(%-5level): %msg%n
 eureka.instance.hostname=fda-table-service
 eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka/
-eureka.instance.preferIpAddress=true
 spring.servlet.multipart.max-file-size=50MB
 spring.servlet.multipart.max-request-size=50MB
 multipart.location=${java.io.tmpdir}
\ No newline at end of file

hystrix-dashboard/Dockerfile

+###### FIRST STAGE ######
+FROM maven:slim as build
+MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+
+COPY ./src ./src
+COPY ./pom.xml ./
+
+RUN mvn -fn -B dependency:go-offline > /dev/null
+
+RUN mvn -q clean package > /dev/null
+
+###### SECOND STAGE ######
+FROM openjdk:11-jre-slim as runtime
+
+COPY --from=build ./rest-service/target/hystrix-dashboard-*.jar ./hystrix.jar
+
+ENTRYPOINT ["java", "-jar", "./hystrix.jar"]