From 4ac6acea15ca58727f1b73a691cea498ac032ce1 Mon Sep 17 00:00:00 2001
From: alainbodiguel <alain.bodiguel@gisaia.com>
Date: Mon, 25 Mar 2024 10:11:51 +0100
Subject: [PATCH] Remove HC from Dockerfile

---
 docker/docker-files/Dockerfile              |  5 +----
 docker/docker-files/Dockerfile-package-only |  5 +----
 docker/docker-files/docker-compose.yml      | 12 +++++++++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/docker/docker-files/Dockerfile b/docker/docker-files/Dockerfile
index a59c42c..b16f118 100644
--- a/docker/docker-files/Dockerfile
+++ b/docker/docker-files/Dockerfile
@@ -17,7 +17,7 @@ RUN mvn install \
 ###################
 # PACKAGING STAGE #
 ###################
-FROM gisaia/arlas-openjdk:17-distroless
+FROM gisaia/arlas-openjdk-17-distroless:20240325094836
 
 # application placed into /opt/app
 WORKDIR /opt/app
@@ -26,8 +26,5 @@ COPY --from=build /opt/build/conf/configuration.yaml /opt/app/
 COPY --from=build /opt/build/arlas-iam-core/src/main/resources/templates/*.ftlh /opt/app/
 EXPOSE 9997
 
-HEALTHCHECK --interval=5m --timeout=3s \
-  CMD curl http://localhost:9997/admin/healthcheck | grep -v "\"healthy\":false" || exit 1
-
 ENV JDK_JAVA_OPTIONS="-Xmx512m -XX:+ExitOnOutOfMemoryError"
 CMD ["arlas-iam-server.jar", "server", "/opt/app/configuration.yaml"]
\ No newline at end of file
diff --git a/docker/docker-files/Dockerfile-package-only b/docker/docker-files/Dockerfile-package-only
index 01b25ea..8042c36 100644
--- a/docker/docker-files/Dockerfile-package-only
+++ b/docker/docker-files/Dockerfile-package-only
@@ -1,7 +1,7 @@
 ###################
 # PACKAGING STAGE #
 ###################
-FROM gisaia/arlas-openjdk:17-distroless
+FROM gisaia/arlas-openjdk-17-distroless:20240325094836
 
 # application placed into /opt/app
 WORKDIR /opt/app
@@ -10,8 +10,5 @@ ADD arlas-iam-server/target/arlas-iam-server*.jar /opt/app/arlas-iam-server.jar
 ADD conf/configuration.yaml /opt/app/configuration.yaml
 EXPOSE 9997
 
-HEALTHCHECK --interval=5m --timeout=3s \
-  CMD curl http://localhost:9997/admin/healthcheck | grep -v "\"healthy\":false" || exit 1
-
 ENV JDK_JAVA_OPTIONS="-Xmx512m -XX:+ExitOnOutOfMemoryError"
 CMD ["arlas-iam-server.jar", "server", "/opt/app/configuration.yaml"]
diff --git a/docker/docker-files/docker-compose.yml b/docker/docker-files/docker-compose.yml
index 308d73e..d33630c 100644
--- a/docker/docker-files/docker-compose.yml
+++ b/docker/docker-files/docker-compose.yml
@@ -78,9 +78,14 @@ services:
     #      - JDK_JAVA_OPTIONS=-javaagent:/opt/app/elastic-apm-agent.jar
     ports:
       - "9997:9997"
+    healthcheck:
+      test: ["CMD","java","HttpHealthcheck.java","http://localhost:9997/admin/healthcheck"]
+      interval: 5s
+      timeout: 10s
+      retries: 3
 
   arlas-server:
-    image: gisaia/arlas-server:24.0.4-SNAPSHOT
+    image: gisaia/arlas-server:24.1.2
     container_name: arlas-server
     labels:
       co.elastic.logs/enabled: true
@@ -120,6 +125,11 @@ services:
     #      - JDK_JAVA_OPTIONS=-javaagent:/opt/app/elastic-apm-agent.jar
     ports:
       - "9999:9999"
+    healthcheck:
+      test: ["CMD","java","HttpHealthcheck.java","http://localhost:9999/admin/healthcheck"]
+      interval: 5s
+      timeout: 10s
+      retries: 3
 
 volumes:
   arlas-iam-db: