Merge pull request #3 from OpenLMIS/1.2.1-SNAPSHOT

Stabilize consul registration and health checks

Author: kszymankiewicz-sd

CHANGELOG.md

@@ -1,6 +1,9 @@
 Upcoming Version / (WIP)
 ==================
 
+Improvements:
+* Stabilized consul registration and health checks
+
 1.1.0 / 2025-11-27
 ==================
 

Dockerfile

@@ -3,4 +3,10 @@ FROM openlmis/service-base:7
 COPY build/libs/*.jar /service.jar
 COPY src/main/resources/db/demo-data/*.csv /demo-data/
 COPY build/schema /schema
+
 COPY build/consul /consul
+WORKDIR /consul
+
+RUN npm install --production
+
+WORKDIR /

build.gradle

@@ -419,7 +419,7 @@ apply from: "registration.gradle"
 
 assemble {
     dependsOn npm_run_runApiHtmlConverter
-    dependsOn copyConsulRegistrationToBuild
+    dependsOn prepareConsulBuild
     dependsOn jacocoTestReport
 }
 

consul/config.json

@@ -1,10 +1,17 @@
 {
   "service": {
     "Name": "dhis2",
+    "Id": "dhis2-service",
     "Port": 8080,
-    "Tags": ["openlmis-service"]
+    "Tags": ["openlmis-service"],
+    "check": {
+      "interval": "10s",
+      "http": "http://HOST:PORT/actuator/health",
+      "timeout": "5s",
+      "deregisterCriticalServiceAfter": "10m"
+    }
   },
-  "raml": "src/main/resources/api-definition.yaml",
+  "raml": "/consul/api-definition.yaml",
   "path": [
     "dhis2",
     "dhis2/docs",
@@ -13,3 +20,4 @@
     "dhis2/webjars/<all>"
   ]
 }
+

consul/package.json

@@ -1,14 +1,16 @@
 {
   "name": "openlmis-consul-registration",
-  "version": "0.0.1",
-
-  "devDependencies":
-  {
-    "uuid": "~3.0.0",
-    "raml-parser": "~0.8.0",
-    "command-line-args": "~3.0.0",
-    "system-sleep": "~1.0.0",
-    "deasync": "~0.1.9",
-    "ip": "~1.1.0"
+  "version": "1.0.0",
+  "description": "Registration script for OpenLMIS Service",
+  "main": "registration.js",
+  "dependencies": {
+    "axios": "^1.6.0",
+    "command-line-args": "^5.2.1",
+    "ip": "^1.1.8",
+    "raml-parser": "~0.8.18",
+    "uuid": "^9.0.0"
+  },
+  "engines": {
+    "node": ">=18"
   }
-}
+}