Merge pull request #169 from buerokratt/dev

Merging dev to test

Author: varmoh

.github/workflows/check-version.yml

@@ -44,8 +44,7 @@ jobs:
         run: |
           awk -v branch="${{ env.BRANCH }}" ' /^[0-9a-zA-Z]+$/ { current_branch = $0; } current_branch == branch && /^[A-Z_]+=/{ print $0; }' release.env | tee -a $GITHUB_ENV >> .env
           echo "BUILDTIME=$(($(date +%s%N)/1000000))" >> .env
-          echo "RELEASE=${{ env.BRANCH }}" >> .env
-          
+
       - name: Set repo
         run: |
            LOWER_CASE_GITHUB_REPOSITORY=$(echo $GITHUB_REPOSITORY | tr '[:upper:]' '[:lower:]')

Dockerfile

@@ -8,12 +8,15 @@ ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 
 RUN apk add --no-cache chromium && apk add --no-cache curl
 COPY package.json .
+COPY .env .env
 # Uncomment this when you run npm install locally
 #RUN npm ci --ignore-scripts
 RUN npm install --ignore-scripts 
 # Run image
 FROM build AS run
 USER node
+
+COPY .env /workspace/app/.env
 COPY controllers controllers
 COPY views views
 COPY lib lib

docker-compose.yml

@@ -8,8 +8,6 @@ services:
       - 3000:3000
     networks:
       - node
-    env_file:
-      - .env
 
 networks:
   node:

package-lock.json

@@ -16,6 +16,7 @@
     "body-parser": "^1.20.3",
     "chokidar": "^4.0.1",
     "crypto-js": "^4.1.1",
+    "dotenv": "^16.5.0",
     "escape-string-regexp": "^5.0.0",
     "exceljs": "^4.4.0",
     "express": "^4.21.2",

package.json

@@ -8,6 +8,7 @@ import fs from "fs";
 import files from "./controllers/files.js";
 import crypto from "crypto";
 import bodyParser from "body-parser";
+import 'dotenv/config'
 
 import encryption from "./controllers/encryption.js";
 import decryption from "./controllers/decryption.js";
@@ -59,7 +60,6 @@ const rateLimit = setRateLimit({
 
 const startTimestamp = new Date().getTime();
 const appName = process.env.APP_NAME || "DataMapper";
-const release = process.env.RELEASE || "unknown";
 const major = process.env.MAJOR || "unknown";
 const minor = process.env.MINOR || "unknown";
 const patch = process.env.PATCH || "unknown";
@@ -290,7 +290,7 @@ app.get("/status", (req, res) => res.status(200).send("ok"));
 app.get("/healthz", (req, res) => {
   res.status(200).send({
     appName,
-    version: `${release}-${major}.${minor}.${patch}`,
+    version: `v${major}.${minor}.${patch}`,
     packagingTime: process.env.BUILDTIME,
     appStartTime: startTimestamp,
     serverTime: new Date().getTime(),