From 84a42794d3c6c6e538c52c860d2083029a3f4956 Mon Sep 17 00:00:00 2001
From: Benjamin Brummer <benjamin.brummer@pinteam.eu>
Date: Mon, 29 Sep 2025 14:08:50 +0200
Subject: [PATCH 1/3] remove package discovery command from production setup

---
 debian/scripts/init.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/scripts/init.sh b/debian/scripts/init.sh
index a587fd7..024d07a 100755
--- a/debian/scripts/init.sh
+++ b/debian/scripts/init.sh
@@ -53,7 +53,6 @@ if [ "$*" = 'frankenphp php-cli artisan octane:frankenphp' ] || [ "${1#-}" != "$
         [ -d /app/storage/logs ] || mkdir -p /app/storage/logs
 
         if [ "$APP_ENV" = "production" ]; then
-            frankenphp php-cli artisan package:discover
             frankenphp php-cli artisan migrate --force
             frankenphp php-cli artisan cache:clear # Clear after the migration
             frankenphp php-cli artisan ninja:design-update

From fa5d522a36f89267a80d1cc3e73a41ad197157b5 Mon Sep 17 00:00:00 2001
From: Benjamin Brummer <benjamin.brummer@pinteam.eu>
Date: Mon, 29 Sep 2025 14:11:58 +0200
Subject: [PATCH 2/3] Update upgrade instructions

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2e24b63..4ff66ce 100644
--- a/README.md
+++ b/README.md
@@ -74,9 +74,8 @@ docker-compose up -d
 To upgrade to a newer release image, update your docker-compose.yml first by running:
 
 ```bash
-docker-compose down
 docker-compose pull
-docker-compose up
+docker-compose up -d
 ```
 
 It is recommended to perform a backup before updating.

From 6f9de01d3bd7728c550ee89e3cf0881f328361e3 Mon Sep 17 00:00:00 2001
From: Benjamin Brummer <benjamin.brummer@pinteam.eu>
Date: Mon, 29 Sep 2025 22:27:42 +0200
Subject: [PATCH 3/3] matrix build with arm runners

---
 .github/workflows/build-image-debian.yaml | 18 ++++++++----------
 .github/workflows/publish-image.yaml      | 22 +++++++++-------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build-image-debian.yaml b/.github/workflows/build-image-debian.yaml
index b1cb9bf..f0e7fe1 100644
--- a/.github/workflows/build-image-debian.yaml
+++ b/.github/workflows/build-image-debian.yaml
@@ -12,15 +12,14 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-22.04
+    runs-on: ${{ startsWith(matrix.platforms, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: ["linux/amd64", "linux/arm64"]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
+        uses: actions/checkout@v5
 
       - name: Set up Docker Buildx
         id: buildx
@@ -28,11 +27,10 @@ jobs:
 
       - name: Build
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: debian  
-          file: debian/Dockerfile  
           load: true
           tags: invoiceninja/invoiceninja-octane:test
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max
\ No newline at end of file
diff --git a/.github/workflows/publish-image.yaml b/.github/workflows/publish-image.yaml
index ad01546..70dc663 100644
--- a/.github/workflows/publish-image.yaml
+++ b/.github/workflows/publish-image.yaml
@@ -7,16 +7,18 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-22.04
+    runs-on: ${{ startsWith(matrix.platforms, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
     strategy:
+      fail-fast: false
       matrix:
+        platform: ["linux/amd64", "linux/arm64"]
         include:
           - image: invoiceninja/invoiceninja-octane
             context: debian
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4  
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -43,33 +45,27 @@ jobs:
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
           echo "major=${MAJOR}" >> $GITHUB_OUTPUT
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3  # Updated from v1
-        with:
-          platforms: all
-
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3  # Updated from v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3  # Updated from v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5  # Updated from v2
+        uses: docker/build-push-action@v6
         with:
           context: ${{ matrix.context }}
           build-args: INVOICENINJA_VERSION=${{ steps.prep.outputs.version }}
-          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.prep.outputs.tags }}
-          cache-from: type=gha  # Updated cache type
+          cache-from: type=gha
           cache-to: type=gha,mode=max
 
       - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
\ No newline at end of file
+        run: echo ${{ steps.docker_build.outputs.digest }}