Merge pull request #776 from donaldzou/DaanSelen-patch-4

.github/workflows/codeql-analyze.yaml

@@ -12,6 +12,7 @@
 name: "CodeQL"
 
 on:
+  workflow_dispatch:
   push:
     branches: [ main ]
   pull_request:

.github/workflows/docker-build.yml

@@ -1,95 +0,0 @@
-name: Docker Build and Push
-
-on:
-  push:
-    branches: [main]
-  workflow_dispatch:
-    inputs:
-      trigger-build:
-        description: 'Trigger a manual build and push'
-        required: true
-        default: 'true'
-
-env:
-  DOCKER_HUB_PREFIX: docker.io
-  GHCR_PREFIX: ghcr.io
-  DOCKER_IMAGE: donaldzou/wgdashboard
-
-jobs:
-  docker_build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.DOCKER_HUB_PREFIX }}
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.GHCR_PREFIX }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Extract metadata (tags, labels)
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.DOCKER_HUB_PREFIX }}/${{ env.DOCKER_IMAGE }}
-            ${{ env.GHCR_PREFIX }}/${{ env.DOCKER_IMAGE }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern=latest,enable={{is_tag}}
-            type=raw,value=main,enable={{ github.event_name == 'push' && is_default_branch }}
-            type=raw,value=nightly,enable={{ github.event_name == 'push' && is_default_branch }}
-
-      - name: Build and export (multi-arch)
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-
-  docker_scan:
-      runs-on: ubuntu-latest
-      needs: docker_build
-      steps:
-        - name: Docker Scout CVEs
-          uses: docker/scout-action@v1
-          with:
-            command: cves
-            image: ${{ env.GHCR_PREFIX }}/${{ env.DOCKER_IMAGE }}:nightly
-            only-severities: critical,high
-            only-fixed: true
-            write-comment: true
-            github-token: ${{ secrets.GITHUB_TOKEN }}
-            exit-code: true
-
-        - name: Docker Scout Compare
-          uses: docker/scout-action@v1
-          with:
-            command: compare
-            image: ${{ env.GHCR_PREFIX }}/${{ env.DOCKER_IMAGE }}:nightly
-            to: ${{ env.GHCR_PREFIX }}/${{ env.DOCKER_IMAGE }}:latest
-            only-severities: critical,high
-            ignore-unchanged: true
-            github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker.yml

@@ -0,0 +1,107 @@
+name: Docker Build and Push
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - 'main'
+
+env:
+  DOCKERHUB_PREFIX: docker.io
+  GITHUB_CONTAINER_PREFIX: ghcr.io
+  DOCKER_IMAGE: donaldzou/wgdashboard
+
+jobs:
+  docker_build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Generate a shorter Git commit sha.
+        id: gen_short_sha
+        run: echo "SHORT_SHA=${GITHUB_SHA::8}" >> $GITHUB_ENV
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKERHUB_PREFIX }}
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.GITHUB_CONTAINER_PREFIX }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: |
+            - linux/amd64
+            - linux/arm64
+            - linux/arm/v7
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta by docs https://github.com/docker/metadata-action
+        id: metadata
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.DOCKERHUB_PREFIX }}/${{ env.DOCKER_IMAGE }}
+            ${{ env.GITHUB_CONTAINER_PREFIX }}/${{ env.DOCKER_IMAGE }}
+          tags: |
+            type=ref,event=branch,format={{ref_name}}
+            type=raw,value=${{ env.SHORT_SHA }}
+            type=semver,pattern={{ version }}
+            type=semver,pattern=latest
+      
+      - name: Print a message
+        run: echo "${{ steps.meta.outputs.tags }}"
+
+      - name: Build and export (multi-arch)
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+
+  docker_scan:
+    runs-on: ubuntu-latest
+    needs: docker_build
+    steps:
+      - name: Docker Scout CVEs
+        uses: docker/scout-action@v1
+        with:
+          command: cves
+          image: ${{ env.GITHUB_CONTAINER_PREFIX }}/${{ env.DOCKER_IMAGE }}:main
+          only-severities: critical,high
+          only-fixed: true
+          write-comment: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          exit-code: true
+
+      - name: Docker Scout Compare
+        uses: docker/scout-action@v1
+        with:
+          command: compare
+          # Set to Github for maximum compat
+          image: ${{ env.GITHUB_CONTAINER_PREFIX }}/${{ env.DOCKER_IMAGE }}:main
+          to: ${{ env.GITHUB_CONTAINER_PREFIX }}/${{ env.DOCKER_IMAGE }}:latest
+          only-severities: critical,high
+          ignore-unchanged: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -18,6 +18,7 @@ src/db/wgdashboard.db
 node_modules/**
 */proxy.js
 src/static/app/proxy.js
+.secrets
 
 # Logs
 logs