diff --git a/docker-compose.yml b/docker-compose.yml index 22510bd96dbd1169f9bff2e4600cfd57960d6bf9..3a33e9c133d95aa8e5461cf251152101a00d229b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,11 +7,9 @@ services: hostname: fda-discovery-server build: ./fda-discovery-server image: fda-discovery-server - environment: - SPRING_PROFILES_ACTIVE: docker + #environment: + # SPRING_PROFILES_ACTIVE: docker network_mode: bridge - expose: - - 9090 ports: - 9090:9090 @@ -21,10 +19,8 @@ services: build: ./fda-gateway-service image: fda-gateway-service network_mode: bridge - environment: - SPRING_PROFILES_ACTIVE: docker - expose: - - 9095 + #environment: + # SPRING_PROFILES_ACTIVE: docker ports: - 9095:9095 links: @@ -49,10 +45,8 @@ services: context: ./fda-database-managing-service image: fda-database-managing-service network_mode: bridge - environment: - SPRING_PROFILES_ACTIVE: docker - expose: - - 9092 + #environment: + # SPRING_PROFILES_ACTIVE: docker ports: - 9092:9092 links: @@ -70,10 +64,8 @@ services: build: ./fda-container-managing-service image: fda-container-managing-service network_mode: bridge - environment: - SPRING_PROFILES_ACTIVE: docker - expose: - - 9091 + #environment: + # SPRING_PROFILES_ACTIVE: docker ports: - 9091:9091 volumes: @@ -91,10 +83,8 @@ services: build: ./fda-query-service image: fda-query-service network_mode: bridge - environment: - SPRING_PROFILES_ACTIVE: docker - expose: - - 9093 + #environment: + # SPRING_PROFILES_ACTIVE: docker ports: - 9093:9093 volumes: @@ -115,10 +105,8 @@ services: image: fda-table-service network_mode: bridge environment: - SPRING_PROFILES_ACTIVE: docker + # SPRING_PROFILES_ACTIVE: docker multipart.location: /tmp - expose: - - 9094 ports: - 9094:9094 volumes: @@ -138,13 +126,11 @@ services: network_mode: bridge command: sh -c "/wait && flask run" environment: - - EUREKA_SERVER=http://fda-discovery-server:9090/eureka - - WAIT_HOSTS=fda-discovery-server:9090 - - WAIT_HOSTS_TIMEOUT=300 - - WAIT_SLEEP_INTERVAL=30 - - WAIT_HOST_CONNECT_TIMEOUT=30 - expose: - - 5000 + EUREKA_SERVER: http://fda-discovery-server:9090/eureka + WAIT_HOSTS: fda-discovery-server:9090 + WAIT_HOSTS_TIMEOUT: 300 + WAIT_SLEEP_INTERVAL: 30 + WAIT_HOST_CONNECT_TIMEOUT: 30 ports: - 5000:5000 volumes: @@ -161,8 +147,6 @@ services: hostname: fda-ui build: ./fda-ui image: fda-ui - expose: - - 3000 ports: - 3000:3000 links: diff --git a/fda-container-managing-service/Dockerfile b/fda-container-managing-service/Dockerfile index 50fb583bfdbb9a967ef59786d5122446be0f1fbf..231bd8a4752d008387e374d4e7fb8256c07c5e78 100644 --- a/fda-container-managing-service/Dockerfile +++ b/fda-container-managing-service/Dockerfile @@ -2,13 +2,14 @@ FROM maven:slim as build MAINTAINER Martin Weise <martin.weise@tuwien.ac.at> -COPY ./api ./api -COPY ./rest-service ./rest-service -COPY ./services ./services COPY ./pom.xml ./ RUN mvn -fn -B dependency:go-offline > /dev/null +COPY ./api ./api +COPY ./rest-service ./rest-service +COPY ./services ./services + RUN mvn -q clean package > /dev/null ###### SECOND STAGE ###### diff --git a/fda-container-managing-service/rest-service/src/main/resources/application-docker.properties b/fda-container-managing-service/rest-service/src/main/resources/application-docker.properties index e2c5a77c393e67a27a41bbf0f060c5b25df8a166..408cd21f2932cea0e27bd4a303a295adb910cbe1 100644 --- a/fda-container-managing-service/rest-service/src/main/resources/application-docker.properties +++ b/fda-container-managing-service/rest-service/src/main/resources/application-docker.properties @@ -3,6 +3,7 @@ spring.application.name=fda-container-managing spring.main.banner-mode=off logging.level.root=warn logging.level.at.=info -eureka.instance.hostname=fda-container-managing -eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka/ +logging.pattern.console="%d %highlight(%-5level): %msg%n" +eureka.instance.hostname=fda-discovery-server +eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:${server.port}/eureka/ eureka.instance.preferIpAddress=true \ No newline at end of file diff --git a/fda-container-managing-service/rest-service/src/main/resources/config.properties b/fda-container-managing-service/rest-service/src/main/resources/config.properties new file mode 100644 index 0000000000000000000000000000000000000000..e993ed9c62272ab86ae23a64f6195f21e465216f --- /dev/null +++ b/fda-container-managing-service/rest-service/src/main/resources/config.properties @@ -0,0 +1 @@ +# https://github.com/Netflix/Hystrix/issues/275 \ No newline at end of file diff --git a/fda-database-managing-service/Dockerfile b/fda-database-managing-service/Dockerfile index d99df42b89b30702d7c2613e3e47bd75cf21e91b..ab1af5623eac67e420c47d291ef9fa1125dfec96 100644 --- a/fda-database-managing-service/Dockerfile +++ b/fda-database-managing-service/Dockerfile @@ -2,13 +2,14 @@ FROM maven:slim as build MAINTAINER Martin Weise <martin.weise@tuwien.ac.at> +COPY ./pom.xml ./ + +RUN mvn -fn -B dependency:go-offline > /dev/null + COPY ./api ./api COPY ./gateways ./gateways COPY ./rest-service ./rest-service COPY ./services ./services -COPY ./pom.xml ./ - -RUN mvn -fn -B dependency:go-offline > /dev/null RUN mvn -q clean package > /dev/null diff --git a/fda-database-managing-service/rest-service/src/main/resources/application-docker.properties b/fda-database-managing-service/rest-service/src/main/resources/application-docker.properties index 3a47b57c4545b9631da3438e670d283246e46cc5..9996d07cce9f72bbb2934a0b0064ca222ae61b6e 100644 --- a/fda-database-managing-service/rest-service/src/main/resources/application-docker.properties +++ b/fda-database-managing-service/rest-service/src/main/resources/application-docker.properties @@ -3,6 +3,7 @@ spring.application.name=fda-database-managing spring.main.banner-mode=off logging.level.root=warn logging.level.at.=info -eureka.instance.hostname=fda-database-managing -eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka/ +logging.pattern.console="%d %highlight(%-5level): %msg%n" +eureka.instance.hostname=fda-discovery-server +eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:${server.port}/eureka/ eureka.instance.preferIpAddress=true \ No newline at end of file diff --git a/fda-database-managing-service/rest-service/src/main/resources/config.properties b/fda-database-managing-service/rest-service/src/main/resources/config.properties new file mode 100644 index 0000000000000000000000000000000000000000..e993ed9c62272ab86ae23a64f6195f21e465216f --- /dev/null +++ b/fda-database-managing-service/rest-service/src/main/resources/config.properties @@ -0,0 +1 @@ +# https://github.com/Netflix/Hystrix/issues/275 \ No newline at end of file diff --git a/fda-discovery-server/Dockerfile b/fda-discovery-server/Dockerfile index 9d488888956d8416c31db8f0a317276d0734ebad..c93c53ada9d6eb59d155986328942842d9c67f80 100644 --- a/fda-discovery-server/Dockerfile +++ b/fda-discovery-server/Dockerfile @@ -2,11 +2,12 @@ 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 +COPY ./src ./src + RUN mvn -q clean package > /dev/null ###### SECOND STAGE ###### diff --git a/fda-discovery-server/src/main/resources/application-docker.properties b/fda-discovery-server/src/main/resources/application-docker.properties index b4fc2cc7f282e44dc9b6f522b8d8ac9cfe3e88d4..eb2714535c1dfdd663f9fa92ac0a7c0bd1e1353e 100644 --- a/fda-discovery-server/src/main/resources/application-docker.properties +++ b/fda-discovery-server/src/main/resources/application-docker.properties @@ -3,8 +3,9 @@ spring.application.name=fda-discovery-server spring.main.banner-mode=off logging.level.root=warn logging.level.at.=info +logging.pattern.console="%d %highlight(%-5level): %msg%n" eureka.client.register-with-eureka=false eureka.client.fetch-registry=false eureka.instance.hostname=fda-discovery-server -eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka/ +eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:${server.port}/eureka/ eureka.instance.preferIpAddress=true \ No newline at end of file diff --git a/fda-discovery-server/src/main/resources/config.properties b/fda-discovery-server/src/main/resources/config.properties new file mode 100644 index 0000000000000000000000000000000000000000..e993ed9c62272ab86ae23a64f6195f21e465216f --- /dev/null +++ b/fda-discovery-server/src/main/resources/config.properties @@ -0,0 +1 @@ +# https://github.com/Netflix/Hystrix/issues/275 \ No newline at end of file diff --git a/fda-gateway-service/Dockerfile b/fda-gateway-service/Dockerfile index 57b0b7bde37beba6a964d6affd9f1d175ec86f9a..ff3ac6687295ee0ef817fa847b4e9a6b932c1272 100644 --- a/fda-gateway-service/Dockerfile +++ b/fda-gateway-service/Dockerfile @@ -2,11 +2,12 @@ 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 +COPY ./src ./src + RUN mvn -q clean package > /dev/null ###### SECOND STAGE ###### diff --git a/fda-gateway-service/pom.xml b/fda-gateway-service/pom.xml index 731f10f5f0f3b9b32e85e0c771087684d5307fee..8432ad081db2a049a39c8eaebc0d43e0caf25b16 100644 --- a/fda-gateway-service/pom.xml +++ b/fda-gateway-service/pom.xml @@ -26,7 +26,7 @@ </dependency> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> + <artifactId>spring-boot-starter-webflux</artifactId> </dependency> <dependency> <groupId>org.springframework.cloud</groupId> diff --git a/fda-gateway-service/src/main/java/at/tuwien/gatewayservice/config/WebConfig.java b/fda-gateway-service/src/main/java/at/tuwien/gatewayservice/config/WebConfig.java index 1673c53b18420db8cb7d45d4bb75aff5394ef350..2b7b0d970bcaaf6574dd9955ce243219613667ac 100644 --- a/fda-gateway-service/src/main/java/at/tuwien/gatewayservice/config/WebConfig.java +++ b/fda-gateway-service/src/main/java/at/tuwien/gatewayservice/config/WebConfig.java @@ -1,14 +1,15 @@ package at.tuwien.gatewayservice.config; import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.reactive.config.CorsRegistry; +import org.springframework.web.reactive.config.WebFluxConfigurer; @Configuration -public class WebConfig implements WebMvcConfigurer { +public class WebConfig implements WebFluxConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**").allowedOrigins("*"); + registry.addMapping("/**") + .allowedOrigins("*"); // FIXME } } diff --git a/fda-gateway-service/src/main/resources/application-docker.properties b/fda-gateway-service/src/main/resources/application-docker.properties index 052b0cd4cbf252f171df90d6117f1391424d716b..b3e8aacf586ff323621f15ce063c565b06778e33 100644 --- a/fda-gateway-service/src/main/resources/application-docker.properties +++ b/fda-gateway-service/src/main/resources/application-docker.properties @@ -4,5 +4,5 @@ spring.main.banner-mode=off logging.level.root=warn logging.level.at.=info 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.hostname=fda-discovery-server +eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:${server.port}/eureka/ \ No newline at end of file diff --git a/fda-gateway-service/src/main/resources/config.properties b/fda-gateway-service/src/main/resources/config.properties new file mode 100644 index 0000000000000000000000000000000000000000..e993ed9c62272ab86ae23a64f6195f21e465216f --- /dev/null +++ b/fda-gateway-service/src/main/resources/config.properties @@ -0,0 +1 @@ +# https://github.com/Netflix/Hystrix/issues/275 \ No newline at end of file diff --git a/fda-query-service/Dockerfile b/fda-query-service/Dockerfile index a51e7bc2efc5c25ca09a9b5a6dfb9ba203e5d5ea..7c86e3e735092bc934fac494300eecf118f60981 100644 --- a/fda-query-service/Dockerfile +++ b/fda-query-service/Dockerfile @@ -2,14 +2,15 @@ FROM maven:slim as build MAINTAINER Martin Weise <martin.weise@tuwien.ac.at> +COPY ./pom.xml ./ + +RUN mvn -fn -B dependency:go-offline > /dev/null + COPY ./api ./api COPY ./gateways ./gateways COPY ./persistence ./persistence COPY ./rest-service ./rest-service COPY ./services ./services -COPY ./pom.xml ./ - -RUN mvn -fn -B dependency:go-offline > /dev/null RUN mvn -q clean package > /dev/null diff --git a/fda-query-service/rest-service/src/main/resources/application-docker.properties b/fda-query-service/rest-service/src/main/resources/application-docker.properties index faabd241e574a163dd8ec273478df11ad08b312c..270e11f5936b56835152aeca3e936a65850544f7 100644 --- a/fda-query-service/rest-service/src/main/resources/application-docker.properties +++ b/fda-query-service/rest-service/src/main/resources/application-docker.properties @@ -3,5 +3,6 @@ spring.application.name=fda-query-service spring.main.banner-mode=off logging.level.root=warn logging.level.at.=info -eureka.instance.hostname=fda-query-service -eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka/ +logging.pattern.console="%d %highlight(%-5level): %msg%n" +eureka.instance.hostname=fda-discovery-server +eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:${server.port}/eureka/ diff --git a/fda-query-service/rest-service/src/main/resources/config.properties b/fda-query-service/rest-service/src/main/resources/config.properties new file mode 100644 index 0000000000000000000000000000000000000000..e993ed9c62272ab86ae23a64f6195f21e465216f --- /dev/null +++ b/fda-query-service/rest-service/src/main/resources/config.properties @@ -0,0 +1 @@ +# https://github.com/Netflix/Hystrix/issues/275 \ No newline at end of file diff --git a/fda-table-service/Dockerfile b/fda-table-service/Dockerfile index 8f1217284432b8f2a53e573e354b0da6b6a0bd5f..9a9c4c854a667c0fdc4fd0fa0948d7e32db57881 100644 --- a/fda-table-service/Dockerfile +++ b/fda-table-service/Dockerfile @@ -2,13 +2,14 @@ FROM maven:slim as build MAINTAINER Martin Weise <martin.weise@tuwien.ac.at> +COPY ./pom.xml ./ + +RUN mvn -fn -B dependency:go-offline > /dev/null + COPY ./api ./api COPY ./gateways ./gateways COPY ./rest-service ./rest-service COPY ./services ./services -COPY ./pom.xml ./ - -RUN mvn -fn -B dependency:go-offline > /dev/null RUN mvn -q clean package > /dev/null diff --git a/fda-table-service/rest-service/src/main/resources/application-docker.properties b/fda-table-service/rest-service/src/main/resources/application-docker.properties index 556c1e3dae1a22737732e1e7322478793bcd4c36..bcb62319432f2a86a5f8e463f97432972e6772b7 100644 --- a/fda-table-service/rest-service/src/main/resources/application-docker.properties +++ b/fda-table-service/rest-service/src/main/resources/application-docker.properties @@ -3,8 +3,9 @@ spring.application.name=fda-table-service spring.main.banner-mode=off logging.level.root=warn logging.level.at.=info -eureka.instance.hostname=fda-table-service -eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka/ +logging.pattern.console="%d %highlight(%-5level): %msg%n" +eureka.instance.hostname=fda-discovery-server +eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:${server.port}/eureka/ 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 diff --git a/fda-table-service/rest-service/src/main/resources/config.properties b/fda-table-service/rest-service/src/main/resources/config.properties new file mode 100644 index 0000000000000000000000000000000000000000..e993ed9c62272ab86ae23a64f6195f21e465216f --- /dev/null +++ b/fda-table-service/rest-service/src/main/resources/config.properties @@ -0,0 +1 @@ +# https://github.com/Netflix/Hystrix/issues/275 \ No newline at end of file