Merge 'origin/main' into v4

Author: vbakke

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/automerge.yaml

@@ -0,0 +1,27 @@
+# name: Dependabot Auto-merge
+# on:
+#   pull_request:
+#     types: [opened, synchronize, reopened]
+
+# permissions:
+#   contents: write
+#   pull-requests: write
+
+# jobs:
+#   dependabot-automerge:
+#     runs-on: ubuntu-latest
+#     if: github.actor == 'dependabot[bot]'
+#     steps:
+#       - name: Dependabot metadata
+#         id: metadata
+#         uses: dependabot/fetch-metadata@v1
+#         with:
+#           github-token: "${{ secrets.GITHUB_TOKEN }}"
+      
+#       - name: Auto-merge minor and patch updates
+#         if: steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'
+#         run: |
+#           gh pr merge --auto --squash "$PR_URL"
+#         env:
+#           PR_URL: ${{ github.event.pull_request.html_url }}
+#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/depoy.yml

@@ -14,11 +14,10 @@ jobs:
       - name: "Set Heroku app & branch for ${{ github.ref }}"
         run: |
           echo $GITHUB_REF
-          if [ "$GITHUB_REF" == "refs/heads/master" ]; then
+          if [ "$GITHUB_REF" == "refs/heads/main" ]; then
             echo "HEROKU_APP=" >> $GITHUB_ENV
-            echo "HEROKU_BRANCH=master" >> $GITHUB_ENV
           fi
-          echo "HEROKU_BRANCH=master" >> $GITHUB_ENV
+          echo "HEROKU_BRANCH=main" >> $GITHUB_ENV
       - name: Install Heroku CLI
         run: |
           curl https://cli-assets.heroku.com/install.sh | sh 

.github/workflows/main.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   workflow_dispatch:
   schedule:
     - cron: "0 7 * * *"
@@ -23,7 +23,7 @@ jobs:
       - name: Semantic Release
         uses: cycjimmy/semantic-release-action@v4
         with:
-          branch: 'master'
+          branch: 'main'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Get Semantic Release Version
@@ -61,19 +61,19 @@ jobs:
         env:
           GITHUB_TOKEN: ${{secrets.ACCESS_TOKEN}}
   heroku:
-    if: github.repository == 'devsecopsmaturitymodel/DevSecOps-MaturityModel' && github.event_name == 'push' && github.ref == 'refs/heads/master'
+    if: github.repository == 'devsecopsmaturitymodel/DevSecOps-MaturityModel' && github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: "Check out Git repository"
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac #v4.0.0
       - name: "Set Heroku app & branch for ${{ github.ref }}"
         run: |
           echo $GITHUB_REF
-          if [ "$GITHUB_REF" == "refs/heads/master" ]; then
+          if [ "$GITHUB_REF" == "refs/heads/main" ]; then
             echo "HEROKU_APP=" >> $GITHUB_ENV
-            echo "HEROKU_BRANCH=master" >> $GITHUB_ENV
+            echo "HEROKU_BRANCH=main" >> $GITHUB_ENV
           fi
-          echo "HEROKU_BRANCH=master" >> $GITHUB_ENV
+          echo "HEROKU_BRANCH=main" >> $GITHUB_ENV
       - name: Install Heroku CLI
         run: |
           curl https://cli-assets.heroku.com/install.sh | sh 

.releaserc.json

@@ -1,5 +1,5 @@
 {
-  "branch": "master",
+  "branch": "main",
   "plugins": [
     [
       "@semantic-release/commit-analyzer",

Dockerfile

@@ -1,19 +1,19 @@
-FROM node:18.7.0-alpine3.18 AS build
+FROM node:24.7.0-alpine3.22 AS build
 
 WORKDIR /usr/src/app
 COPY package.json package-lock.json ./
 
-RUN apk add --upgrade python3 build-base \
+RUN apk add --upgrade python3 build-base py3-setuptools py3-pip && \
+    pip3 install setuptools \
     && npm install
 COPY . .
-RUN npm run build
+RUN npm run build --configuration=production
 
-# dsomm-yaml-generation 1.15.3 is a release (not built everyday as 1.16.0)
-FROM wurstbrot/dsomm-yaml-generation:1.15.3 as yaml
 
-# Caddt v2.10.0 is latest release
-FROM caddy:2.10.0
-ENV PORT 8080
+FROM wurstbrot/dsomm-yaml-generation:1.16.0 AS yaml
+
+FROM caddy:2.10.2
+ENV PORT=8080
 
 COPY Caddyfile /etc/caddy/Caddyfile
 COPY --from=build ["/usr/src/app/dist/dsomm/", "/srv"]

package-lock.json

@@ -4,7 +4,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build",
+    "build": "ng build --configuration=production" ,
     "watch": "ng build --watch --configuration development",
     "test": "ng test",
     "lint": "ng lint",
@@ -31,7 +31,7 @@
     "js-yaml": "^4.1.0",
     "markdown-it": "^13.0.1",
     "rxjs": "~7.5.0",
-    "tslib": "^2.3.0",
+    "tslib": "^2.8.1",
     "xlsx": "^0.18.5",
     "yaml": "^2.8.1",
     "yamljs": "^0.3.0",
@@ -48,7 +48,7 @@
     "@grafana/faro-webpack-plugin": "^0.1.1",
     "@types/d3": "^7.4.0",
     "@types/jasmine": "~3.10.0",
-    "@types/js-yaml": "^4.0.5",
+    "@types/js-yaml": "^4.0.9",
     "@types/markdown-it": "^12.2.3",
     "@types/node": "^12.11.1",
     "@types/yamljs": "^0.2.31",
@@ -64,7 +64,7 @@
     "jasmine-core": "~4.0.0",
     "karma": "~6.3.0",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage": "~2.1.0",
+    "karma-coverage": "~2.2.1",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "~1.7.0",
     "prettier": "^2.7.1",