.gitlab-ci.yml

@@ -106,34 +106,46 @@ variables:
 
 prepare_release:
   stage: prepare
-  rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: '$CI_COMMIT_BRANCH == "prerelease-semver"'
+  # rules:
+  #   - if: $CI_COMMIT_TAG
+  #   - when: never
+  #   - if: '$CI_COMMIT_BRANCH == "prerelease-semver"'
   script:
-    - echo "EXTRA_DESCRIPTION=some message" >> variables.env
-    - echo "TAG=v$(cat VERSION)" >> variables.env
-  artifacts:
-    reports:
-      dotenv: variables.env
+    # - echo "EXTRA_DESCRIPTION=some message" >> variables.env
+    # - echo "TAG=v$(cat VERSION)" >> variables.env
+    - echo "TAG=v$(cat VERSION)"
+  # artifacts:
+  #   reports:
+  #     dotenv: variables.env
 
-release_station_software:
+# release_station_software:
+#   stage: release
+#   image: registry.gitlab.com/gitlab-org/release-cli:latest
+#   needs:
+#     - job: prepare_release
+#       artifacts: true
+#   rules:
+#     - if: $CI_COMMIT_TAG
+#     - when: never
+#     - if: '$CI_COMMIT_BRANCH == "prerelease-semver"'
+#   script:
+#     - echo "Running the release job for $TAG"
+#   release:
+#     name: "Release $TAG"
+#     description: "[TEST] Release created using the release-cli after merging commit. $EXTRA_DESCRIPTION"
+#     tag_name: "$TAG"
+#     ref: "$CI_COMMIT_SHA"
+
+release:
+  image: node:18-buster-slim
   stage: release
-  image: registry.gitlab.com/gitlab-org/release-cli:latest
-  needs:
-    - job: prepare_release
-      artifacts: true
-  rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: '$CI_COMMIT_BRANCH == "prerelease-semver"'
+  before_script:
+    - apt-get update && apt-get install -y --no-install-recommends git-core ca-certificates
+    - npm install -g semantic-release @semantic-release/git @semantic-release/gitlab
   script:
-    - echo "Running the release job for $TAG"
-  release:
-    name: "Release $TAG"
-    description: "[TEST] Release created using the release-cli after merging commit. $EXTRA_DESCRIPTION"
-    tag_name: "$TAG"
-    ref: "$CI_COMMIT_SHA"
+    - semantic-release
+  rules:
+    - if: $CI_COMMIT_BRANCH == "prerelease-semver"
 
 # include:
 #   - template: Code-Quality.gitlab-ci.yml

.husky/commit-msg

+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit "$1"

Dockerfile

@@ -3,11 +3,16 @@ FROM node:latest as node_cache
 # Create app directory
 WORKDIR /usr/src/app
 
+ENV NODE_ENV=production
+
 # Install app dependencies
 # A wildcard is used to ensure both package.json AND package-lock.json are copied
 # where available (npm@5+)
 COPY package*.json ./
-RUN npm install
+
+# Disable husky in CI/Docker/Prod
+# Install only production dependencies in the Docker image to reduce size
+RUN npm pkg delete scripts.prepare && npm ci --only=production
 
 #Install dependencies for wizard UI
 COPY wizard-frontend/package*.json ./wizard-frontend/

Dockerfile.dev

+FROM node:latest as node_cache
+
+# Create app directory
+WORKDIR /usr/src/app
+
+# Install app dependencies
+# A wildcard is used to ensure both package.json AND package-lock.json are copied
+# where available (npm@5+)
+COPY package*.json ./
+RUN npm install
+
+#Install dependencies for wizard UI
+COPY wizard-frontend/package*.json ./wizard-frontend/
+RUN npm --prefix wizard-frontend install
+
+#Install dependencies for main UI
+COPY station-frontend/package*.json ./station-frontend/
+RUN npm --prefix station-frontend install
+
+FROM gcr.io/projectsigstore/cosign:v2.2.1 as cosign-bin
+
+FROM node:latest
+
+WORKDIR /usr/src/app
+
+COPY --from=node_cache /usr/src/app/ .
+
+# Bundle app source
+COPY . .
+
+RUN mkdir /lockfiledir
+
+# Copy cosign binary
+COPY --from=cosign-bin /ko-app/cosign /usr/local/bin/cosign
+
+EXPOSE 3030
+CMD [ "npm", "run", "dev" ]

StationDeploymentFiles/docker-compose-dev.yml

@@ -55,7 +55,9 @@ services:
     restart: unless-stopped
 
   pht-web:
-    build: ../
+    build:
+      context: ../
+      dockerfile: Dockerfile.dev
     container_name: '${PROJECTNAME}pht-web'
     command: ${COMMAND-/bin/sh -c "while sleep 1000; do :; done"}
     ports:

app.js

@@ -19,7 +19,7 @@ function randomString(size = 21) {
 
 var app = express();
 
-if (process.env.NODE_ENV) {
+if (process.env.NODE_ENV === "development") {
   app.use(
     cors({
       origin: ["http://localhost:3001", "http://127.0.0.1:3001"],

commitlint.config.js

+module.exports = {
+  extends: ["@commitlint/config-conventional"],
+};

installationWizard/app.js

@@ -12,7 +12,7 @@ const app = express();
  * Port can be replaced with whatever port react
  * app is running on.
  */
-if (process.env.NODE_ENV) {
+if (process.env.NODE_ENV === "development") {
   app.use(
     cors({
       origin: ["http://localhost:3001", "http://127.0.0.1:3001"],

package.json

 {
-  "name": "pht-web",
-  "version": "0.0.0",
+  "name": "@padme-development/padme-station-software",
+  "version": "1.0.1",
+  "description": "A Dockerized Javascript Web Application providing interfaces for Monitoring of the algorithms and components, which manage the business logic e.g. pulling a train, execute a train, inspect the results, and many more.",
+  "license": "MIT",
+  "homepage": "https://git.rwth-aachen.de/padme-development/padme-station-software",
   "private": true,
   "scripts": {
+    "cm": "cz",
     "build:wizard": "npm run build --prefix wizard-frontend",
     "build:station": "npm run build --prefix station-frontend",
     "start": "npm run build:wizard && npm run build:station && node ./bin/www",
     "dev": "NODE_ENV=development nodemon ./bin/www",
-    "test": "jest"
+    "test": "jest",
+    "semantic-release": "semantic-release",
+    "prepare": "husky install"
   },
   "dependencies": {
     "async-mutex": "^0.4.0",
@@ -35,12 +41,52 @@
     "wait-queue": "^1.1.4"
   },
   "devDependencies": {
+    "@commitlint/cli": "^18.4.3",
+    "@commitlint/config-conventional": "^18.4.3",
+    "commitizen": "^4.3.0",
     "cors": "^2.8.5",
+    "cz-conventional-changelog": "^3.3.0",
     "eslint": "^8.48.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.28.1",
+    "husky": "^8.0.3",
     "jest": "^29.6.4",
     "jest-junit": "^16.0.0",
-    "nodemon": "^3.0.1"
+    "nodemon": "^3.0.1",
+    "semantic-release": "^22.0.8"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "release": {
+    "branches": [
+      "main",
+      "prerelease-semver"
+    ],
+    "plugins": [
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      "@semantic-release/gitlab",
+      [
+        "@semantic-release/npm",
+        {
+          "npmPublish": false
+        }
+      ],
+      [
+        "@semantic-release/git",
+        {
+          "assets": [
+            "package.json"
+          ],
+          "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+        }
+      ]
+    ]
+  },
+  "config": {
+    "commitizen": {
+      "path": "cz-conventional-changelog"
+    }
   }
 }