Merge pull request #809 from benbrummer/octane

Remove artisan package:discover

.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
+        uses: actions/checkout@v5
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
 
       - 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

.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 }}
+        run: echo ${{ steps.docker_build.outputs.digest }}

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.

debian/Dockerfile

@@ -92,7 +92,7 @@ COPY --chmod=0755 scripts/init.sh /usr/local/bin/init.sh
 
 USER ${user}
 
-HEALTHCHECK --start-period=10s CMD curl -f http://localhost/health
+HEALTHCHECK --start-period=100s CMD curl -f http://localhost/health
 
 ENTRYPOINT ["/usr/local/bin/init.sh"]
 

debian/scripts/init.sh

@@ -46,31 +46,30 @@ if [ "$*" = 'frankenphp php-cli artisan octane:frankenphp' ] || [ "${1#-}" != "$
 
         # Check for required folders and create if needed, relevant for bind mounts
         # It is not possible to chown, as we are not executing this script as root
+        [ -d /var/www/html/storage/app/public ] || mkdir -p /var/www/html/storage/app/public
         [ -d /app/storage/framework/sessions ] || mkdir -p /app/storage/framework/sessions
         [ -d /app/storage/framework/views ] || mkdir -p /app/storage/framework/views
         [ -d /app/storage/framework/cache ] || mkdir -p /app/storage/framework/cache
         [ -d /app/storage/logs ] || mkdir -p /app/storage/logs
 
         if [ "$APP_ENV" = "production" ]; then
+            frankenphp php-cli artisan migrate --force
+            frankenphp php-cli artisan cache:clear # Clear after the migration
+            frankenphp php-cli artisan ninja:design-update
             frankenphp php-cli artisan optimize
-        fi
 
-        frankenphp php-cli artisan package:discover
+            # If first IN run, it needs to be initialized
+            if [ "$(frankenphp php-cli artisan tinker --execute='echo Schema::hasTable("accounts") && !App\Models\Account::all()->first();')" = "1" ]; then
+                echo "Running initialization..."
 
-        # Run migrations (if any)
+                frankenphp php-cli artisan db:seed --force
-        frankenphp php-cli artisan migrate --force
 
-        # If first IN run, it needs to be initialized
+                if [ -n "${IN_USER_EMAIL}" ] && [ -n "${IN_PASSWORD}" ]; then
-        if [ "$(frankenphp php-cli artisan tinker --execute='echo Schema::hasTable("accounts") && !App\Models\Account::all()->first();')" = "1" ]; then
+                    frankenphp php-cli artisan ninja:create-account --email "${IN_USER_EMAIL}" --password "${IN_PASSWORD}"
-            echo "Running initialization..."
+                else
-
+                    echo "Initialization failed - Set IN_USER_EMAIL and IN_PASSWORD in .env"
-            frankenphp php-cli artisan db:seed --force
+                    exit 1
-
+                fi
-            if [ -n "${IN_USER_EMAIL}" ] && [ -n "${IN_PASSWORD}" ]; then
-                frankenphp php-cli artisan ninja:create-account --email "${IN_USER_EMAIL}" --password "${IN_PASSWORD}"
-            else
-                echo "Initialization failed - Set IN_USER_EMAIL and IN_PASSWORD in .env"
-                exit 1
             fi
         fi