From 6466183981849309ebde73eda6d94baa5b53e91b Mon Sep 17 00:00:00 2001
From: Kili <mkilijanek@users.noreply.github.com>
Date: Sat, 20 Dec 2025 22:17:36 +0100
Subject: [PATCH 1/2] Add Docker image build and publish to master workflow

---
 .github/workflows/master.yml | 50 ++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 8a3aff54..ad586151 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -6,6 +6,11 @@ on:
     branches:
     - master
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+  PLATFORMS: linux/amd64,linux/arm64
+
 jobs:
   main:
     runs-on: ubuntu-latest
@@ -56,3 +61,48 @@ jobs:
         build_dir: ./build/prod
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  docker-images:
+    name: Build & Publish Docker Images
+    runs-on: ubuntu-latest
+    needs: main
+    if: github.ref == 'refs/heads/master'
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Log in to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Docker metadata
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+        tags: |
+          type=raw,value=latest
+          type=sha,format=long
+
+    - name: Build and push multi-arch image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: ./Dockerfile
+        platforms: ${{ env.PLATFORMS }}
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max

From 8e1d2e51830e745370363b3dab3c345cbafef7ad Mon Sep 17 00:00:00 2001
From: Kili <mkilijanek@users.noreply.github.com>
Date: Sat, 20 Dec 2025 22:27:56 +0100
Subject: [PATCH 2/2] Remove redundant CodeQL SARIF upload

---
 .github/workflows/codeql-analysis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f25d918d..ff3c2b41 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -57,9 +57,3 @@ jobs:
         with:
           category: "/language:${{ matrix.language }}"
           upload: true
-
-      - name: Upload SARIF results
-        if: always()
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: ../results