Increased the timeout of healthcheck, fixed a frontend compile issue with missing node-sass

Former-commit-id: e4509189

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

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 ./

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
 

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

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
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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 [

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"