add APP_VERSION & BUILD_SHA to Dockerfiles

add closing curly brace to status message
clearlydefined · Sep 30, 2024 · 3831bd0 · 3831bd0
1 parent c008d00
commit 3831bd0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/DevDockerfile b/DevDockerfile
@@ -15,8 +15,14 @@ ENV APPDIR=/opt/service
 # COPY init_container.sh /bin/
 # RUN chmod 755 /bin/init_container.sh
 # CMD ["/bin/init_container.sh"]
+
+# Set environment variables from build arguments
 ARG BUILD_NUMBER=0
-ENV BUILD_NUMBER=$BUILD_NUMBER
+ENV BUILD_NUMBER=$APP_VERSION
+ARG APP_VERSION="UNKNOWN"
+ENV APP_VERSION=$APP_VERSION
+ARG BUILD_SHA="UNKNOWN"
+ENV BUILD_SHA=$BUILD_SHA
 
 COPY patches /tmp/patches
 COPY .npmrc package*.json /tmp/

diff --git a/Dockerfile b/Dockerfile
@@ -15,8 +15,14 @@ ENV APPDIR=/opt/service
 # COPY init_container.sh /bin/
 # RUN chmod 755 /bin/init_container.sh
 # CMD ["/bin/init_container.sh"]
+
+# Set environment variables from build arguments
 ARG BUILD_NUMBER=0
-ENV BUILD_NUMBER=$BUILD_NUMBER
+ENV BUILD_NUMBER=$APP_VERSION
+ARG APP_VERSION="UNKNOWN"
+ENV APP_VERSION=$APP_VERSION
+ARG BUILD_SHA="UNKNOWN"
+ENV BUILD_SHA=$BUILD_SHA
 
 COPY patches /tmp/patches
 COPY .npmrc package*.json /tmp/

diff --git a/routes/index.js b/routes/index.js
@@ -4,7 +4,7 @@ const express = require('express')
 const router = express.Router()
 
 router.get('/', function (req, res) {
- const msg = `{ "status": "OK", "version": "${version}", "sha": "${sha}"`
+ const msg = `{ "status": "OK", "version": "${version}", "sha": "${sha}" }`
  res.status(200).send(msg)
 })