From e4509189ea430e586154f0cf20d4366e5028749e Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 6 Dec 2021 16:32:39 +0100
Subject: [PATCH] Increased the timeout of healthcheck, fixed a frontend
compile issue with missing node-sass
---
Makefile | 2 ++
fda-analyse-service/Dockerfile | 2 +-
fda-authentication-service/Dockerfile | 2 +-
fda-broker-service/Dockerfile | 2 +-
fda-citation-service/Dockerfile | 2 +-
fda-container-service/Dockerfile | 2 +-
fda-database-service/Dockerfile | 2 +-
fda-discovery-service/Dockerfile | 2 +-
fda-gateway-service/Dockerfile | 2 +-
fda-metadata-db/Dockerfile | 2 +-
fda-query-service/Dockerfile | 2 +-
fda-table-service/Dockerfile | 2 +-
fda-ui/nuxt.config.js | 8 ++++++++
fda-ui/yarn.lock | 5 +++++
14 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 3002112370..752bc43499 100644
--- a/Makefile
+++ b/Makefile
@@ -169,6 +169,8 @@ logs:
clean:
docker-compose down
docker volume rm fda-services_fda-metadata-db-data || true
+ docker volume rm fda-public || true
+ docker volume rm fda-userdb || true
teardown:
./.rhel-prod/teardown
diff --git a/fda-analyse-service/Dockerfile b/fda-analyse-service/Dockerfile
index 6a0c075bc2..7fca5435b2 100644
--- a/fda-analyse-service/Dockerfile
+++ b/fda-analyse-service/Dockerfile
@@ -12,7 +12,7 @@ COPY requirements.txt requirements.txt
RUN pip install -r requirements.txt > /dev/null
-HEALTHCHECK --interval=25s --timeout=3s --retries=2 CMD ./service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD ./service_ready
COPY ./as-yml ./
COPY ./*.py ./
diff --git a/fda-authentication-service/Dockerfile b/fda-authentication-service/Dockerfile
index 33a2c8dc93..d2512788ad 100644
--- a/fda-authentication-service/Dockerfile
+++ b/fda-authentication-service/Dockerfile
@@ -26,7 +26,7 @@ VOLUME /tmp
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
diff --git a/fda-broker-service/Dockerfile b/fda-broker-service/Dockerfile
index 167f5aad08..55357fa97b 100644
--- a/fda-broker-service/Dockerfile
+++ b/fda-broker-service/Dockerfile
@@ -6,4 +6,4 @@ RUN chmod +x /usr/bin/service_ready
COPY ./rabbitmq.conf /etc/rabbitmq/
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
\ No newline at end of file
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
\ No newline at end of file
diff --git a/fda-citation-service/Dockerfile b/fda-citation-service/Dockerfile
index c33450b0d1..c2258f9d10 100644
--- a/fda-citation-service/Dockerfile
+++ b/fda-citation-service/Dockerfile
@@ -24,7 +24,7 @@ FROM openjdk:11-jre-slim as runtime
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
COPY --from=build ./rest-service/target/rest-service-*.jar ./rest.jar
diff --git a/fda-container-service/Dockerfile b/fda-container-service/Dockerfile
index dee2b4fff0..ab6ed411c3 100644
--- a/fda-container-service/Dockerfile
+++ b/fda-container-service/Dockerfile
@@ -24,7 +24,7 @@ FROM openjdk:11-jre-slim as runtime
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
diff --git a/fda-database-service/Dockerfile b/fda-database-service/Dockerfile
index d904bc64f5..37f6af6d91 100644
--- a/fda-database-service/Dockerfile
+++ b/fda-database-service/Dockerfile
@@ -24,7 +24,7 @@ FROM openjdk:11-jre-slim as runtime
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
diff --git a/fda-discovery-service/Dockerfile b/fda-discovery-service/Dockerfile
index 4394f693e9..34efa364a4 100644
--- a/fda-discovery-service/Dockerfile
+++ b/fda-discovery-service/Dockerfile
@@ -18,7 +18,7 @@ FROM openjdk:11-jre-slim as runtime
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
COPY --from=build ./discovery/target/discovery-*.jar ./discovery.jar
diff --git a/fda-gateway-service/Dockerfile b/fda-gateway-service/Dockerfile
index 5a28e0e216..ac41d0f03d 100644
--- a/fda-gateway-service/Dockerfile
+++ b/fda-gateway-service/Dockerfile
@@ -18,7 +18,7 @@ FROM openjdk:11-jre-slim as runtime
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
COPY --from=build ./gateway/target/gateway-*.jar ./gateway.jar
diff --git a/fda-metadata-db/Dockerfile b/fda-metadata-db/Dockerfile
index 5bde8a89c6..51ea8b6ec4 100644
--- a/fda-metadata-db/Dockerfile
+++ b/fda-metadata-db/Dockerfile
@@ -19,7 +19,7 @@ RUN mvn -q clean install > /dev/null
FROM postgres:latest as runtime
# Scripts are copied to /docker-entrypoint-initdb.d/ in docker-compose from analyze service
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD pg_isready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD pg_isready
COPY ./initi.sh /docker-entrypoint-initdb.d/
RUN chmod +x /docker-entrypoint-initdb.d/initi.sh
diff --git a/fda-query-service/Dockerfile b/fda-query-service/Dockerfile
index a1b52c191c..0310181995 100644
--- a/fda-query-service/Dockerfile
+++ b/fda-query-service/Dockerfile
@@ -24,7 +24,7 @@ FROM openjdk:11-jre-slim as runtime
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
diff --git a/fda-table-service/Dockerfile b/fda-table-service/Dockerfile
index d4639d2994..6cacb7df5b 100644
--- a/fda-table-service/Dockerfile
+++ b/fda-table-service/Dockerfile
@@ -24,7 +24,7 @@ FROM openjdk:11-jre-slim as runtime
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
COPY --from=build ./rest-service/target/rest-service-*.jar ./rest.jar
diff --git a/fda-ui/nuxt.config.js b/fda-ui/nuxt.config.js
index ae0deb0264..4dce4966bd 100644
--- a/fda-ui/nuxt.config.js
+++ b/fda-ui/nuxt.config.js
@@ -110,6 +110,14 @@ export default {
},
build: {
+ loaders: {
+ sass: {
+ implementation: require('sass')
+ },
+ scss: {
+ implementation: require('sass')
+ }
+ },
babel: {
presets (env, [preset, options]) {
return [
diff --git a/fda-ui/yarn.lock b/fda-ui/yarn.lock
index a449d83bf9..7049b466a6 100644
--- a/fda-ui/yarn.lock
+++ b/fda-ui/yarn.lock
@@ -6333,6 +6333,11 @@
"resolved" "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz"
"version" "5.1.9"
+"immutable@^4.0.0":
+ "integrity" "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
+ "resolved" "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz"
+ "version" "4.0.0"
+
"import-cwd@^2.0.0":
"integrity" "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk="
"resolved" "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz"
--
GitLab