From d4f0613865b506eb1e689225b5d8744d5620e238 Mon Sep 17 00:00:00 2001 From: Utkarsh-Patel-13 Date: Fri, 1 Aug 2025 13:07:29 -0700 Subject: [PATCH] Fixed docker build hook to build for all architectures --- .github/workflows/docker_build.yaml | 8 ++++++++ docker-compose.override.yml | 8 ++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker_build.yaml b/.github/workflows/docker_build.yaml index bba4d6b..c1fe482 100644 --- a/.github/workflows/docker_build.yaml +++ b/.github/workflows/docker_build.yaml @@ -142,6 +142,9 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -163,6 +166,7 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + platforms: linux/amd64,linux/arm64 # Optional: Add build cache for faster builds cache-from: type=gha cache-to: type=gha,mode=max @@ -185,6 +189,9 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -206,6 +213,7 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + platforms: linux/amd64,linux/arm64 # Optional: Add build cache for faster builds cache-from: type=gha cache-to: type=gha,mode=max diff --git a/docker-compose.override.yml b/docker-compose.override.yml index e242053..4496ae1 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -2,9 +2,7 @@ version: '3.8' services: frontend: - build: - context: ./surfsense_web - dockerfile: Dockerfile + image: ghcr.io/modsetter/surfsense_ui:latest ports: - "${FRONTEND_PORT:-3000}:3000" volumes: @@ -18,9 +16,7 @@ services: - NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL:-http://backend:8000} backend: - build: - context: ./surfsense_backend - dockerfile: Dockerfile + image: ghcr.io/modsetter/surfsense_backend:latest ports: - "${BACKEND_PORT:-8000}:8000" volumes: