From 8a2d140fa5c232cd2161c79a381d431bb7181bd1 Mon Sep 17 00:00:00 2001
From: Daan Selen <dselen@nerthus.nl>
Date: Thu, 27 Nov 2025 23:44:55 +0100
Subject: [PATCH] revert to old method with changes

---
 .github/workflows/docker.yml | 58 ++----------------------------------
 docker/Dockerfile            |  7 +++++
 2 files changed, 10 insertions(+), 55 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c8c452e9..eab468d5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -23,14 +23,6 @@ jobs:
       packages: write
     strategy:
       fail-fast: false
-      matrix:
-        variant:
-          - name: amd64
-            arch: linux/amd64
-          - name: arm64
-            arch: linux/arm64
-          - name: armv7
-            arch: linux/arm/v7
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -52,7 +44,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
-          platforms: ${{ matrix.variant.arch }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -84,54 +76,10 @@ jobs:
         with:
           context: .
           file: ./docker/Dockerfile
-          push: false
-          outputs: type=docker,dest=/dist/image-${{ matrix.variant.name }}.tar
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: ${{ matrix.variant.arch }}
-
-      - name: Upload docker image as artifact
-        uses: actions/upload-artifact@v5
-        with:
-          name: image-${{ matrix.variant.name }}
-          path: /dist/image-${{ matrix.variant.name }}.tar
-
-  docker_merge:
-    runs-on: ubuntu-latest
-#    needs: docker_build
-    steps:
-      - name: Make workspace directory
-        run: mkdir -p /workspace
-
-      - name: Download all artifacts
-        uses: actions/download-artifact@v5
-        with:
-          path: /workspace
-
-      - name: Install dependencies
-        run: |
-            mv /etc/apt/sources.list.d/microsoft-prod.list /etc/apt/sources.list.d/microsoft-prod.list.disabled
-
-            apt-get update && apt-get install -y unzip tree
-
-      - name: List workspace contents
-        run: |
-            cd /workspace
-
-            echo "Extracting"
-            for zip in $(find ./ -type f -name "image-*.zip"); do
-              echo "Found zip: $zip";
-              unzip $zip
-            done
-            ls -lah && tree
-
-            echo "Loading"
-            for tar in $(find ./ -type f -name "image-*.tar"); do
-              echo "Found zip: $tar";
-              docker load -i $tar
-            done
-
-            docker images
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
 
   docker_scan:
     if: ${{ github.event_name != 'pull_request' }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 79cf12bf..5e3df1f2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -56,6 +56,8 @@ RUN make && chmod +x wg*
 # Use the python-alpine image for building pip dependencies
 FROM python:3.14-alpine AS pip-builder
 
+ARG TARGETPLATFORM
+
 # Add the build dependencies and create a Python virtual environment.
 RUN apk add --no-cache \
       build-base \
@@ -72,6 +74,11 @@ RUN apk add --no-cache \
 
 # Copy the requirements file into the build layer.
 COPY ./src/requirements.txt /opt/wgdashboard/src
+RUN if [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
+      sed -i "s|psycopg\[binary\]==3.2.13|psycopg\[c\]==3.2.13|" /opt/wgdashboard/src/requirements.txt; \
+    fi; \
+    cat /opt/wgdashboard/src/requirements.txt
+
 # Install the pip packages
 RUN . /opt/wgdashboard/src/venv/bin/activate && \
     pip3 install --upgrade pip && \