Merge pull request #6 from OpenLMIS/5.2.15-SNAPSHOT

Fix build, stabilize consul registration and health checks

Author: kszymankiewicz-sd

Dockerfile

@@ -1,18 +1,19 @@
 FROM nginx:1.24.0
 
-ADD  nginx.conf /etc/nginx/conf.d/default.conf
+ADD nginx.conf /etc/nginx/conf.d/default.conf
 
 COPY /build/webapp /usr/share/nginx/html
 COPY /consul /consul
 COPY run.sh /run.sh
 
-RUN chmod +x run.sh \
-  && apt-get update \
-  && apt-get install -y curl gnupg \
-  && curl -sL https://deb.nodesource.com/setup_12.x | bash - \
-  && apt-get install -y nodejs \
-  && apt-get install -y gettext \
-  && mv consul/package.json package.json \
-  && npm install
+RUN chmod +x run.sh
+COPY --from=node:12-bullseye /usr/local/bin/node /usr/local/bin/node
+COPY --from=node:12-bullseye /usr/local/lib/node_modules /usr/local/lib/node_modules
+RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
+    ln -s /usr/local/lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx
 
-CMD ./run.sh
+RUN apt-get update && apt-get install -y gettext
+RUN mv consul/package.json package.json
+RUN npm install
+
+CMD ["./run.sh"]

consul/config.json

@@ -1,11 +1,18 @@
 {
   "service": {
     "Name": "reference-ui",
+    "Id": "reference-ui-service",
     "Port": 80,
-    "Tags": ["openlmis-service"]
+    "Tags": ["openlmis-service"],
+    "check": {
+      "interval": "30s",
+      "http": "http://HOST:PORT/",
+      "timeout": "5s",
+      "deregisterCriticalServiceAfter": "10m"
+    }
   },
   "path": [
-    "",
+    "/",
     "<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"
   }
-}
+}