Merge pull request #809 from benbrummer/octane

Remove artisan package:discover
matrix build with arm runners
2026-01-07 23:17:25 +01:00 · 2025-09-30 07:07:17 +10:00 · 2025-09-29 22:27:42 +02:00 · 2025-09-29 14:11:58 +02:00 · 2025-09-29 14:08:50 +02:00 · 2025-09-29 08:09:36 +10:00
11 changed files with 46 additions and 90 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,24 +0,0 @@
-# EditorConfig is awesome: https://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-
-# Matches multiple files with brace expansion notation
-# Set default charset
-[*.*]
-charset = utf-8
-
-# Tab indentation (no size specified)
-[Makefile]
-indent_style = tab
-
-# Matches the files *.yml
-[*.yml]
-indent_style = space
-indent_size = 2
-
--- 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
--- 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 }}
+        run: echo ${{ steps.docker_build.outputs.digest }}
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +0,0 @@
-# OS files
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
-
-# Helm
-charts/**/charts/
-
-# Compose filesystem
-/docker
--- 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.
--- a/debian/.env
+++ b/debian/.env
@@ -1,5 +1,5 @@
 # IN application vars
-APP_URL=http://localhost:8012
+APP_URL=http://localhost
 APP_KEY=base64:RR++yx2rJ9kdxbdh3+AmbHLDQu+Q76i++co9Y8ybbno=
 APP_ENV=production
 APP_DEBUG=true
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -1,6 +1,6 @@
-ARG PHP_VERSION=8.3
+ARG PHP_VERSION=8.4
 ARG FRANKENPHP_VERSION=1
-ARG DEBIAN_VERSION=bookworm
+ARG DEBIAN_VERSION=trixie

 FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php${PHP_VERSION}-${DEBIAN_VERSION} AS prepare-app

@@ -72,6 +72,9 @@ RUN ln -s "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini"

 COPY php/php.ini /usr/local/etc/php/conf.d/invoiceninja.ini

+# Workaround: Disable SSL for mariadb-client for compatibility with MySQL
+RUN echo "skip-ssl = true" >> /etc/mysql/mariadb.conf.d/50-client.cnf
+
 # Create directory for artisan tinker (init.sh)
 RUN mkdir /config/psysh \
    && chown ${user}: /config/psysh
@@ -89,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"]

--- a/debian/docker-compose.yml
+++ b/debian/docker-compose.yml
@@ -16,7 +16,7 @@ services:
  app:
    build:
      context: .
-    image: invoiceninja/invoiceninja-debian:${TAG:-latest}
+    image: invoiceninja/invoiceninja-octane:${TAG:-latest}
    restart: unless-stopped
    # php artisan help octane:frankenphp
    command: --port=80 --workers=2 --log-level=info
@@ -42,7 +42,7 @@ services:
    logging: *default-logging
  
  app-worker:
-    image: invoiceninja/invoiceninja-debian:${TAG:-latest}
+    image: invoiceninja/invoiceninja-octane:${TAG:-latest}
    restart: unless-stopped
    # php artisan help queue:work
    command: --verbose --sleep=3 --tries=3 --max-time=3600
@@ -63,7 +63,7 @@ services:
    logging: *default-logging

  app-scheduler:
-    image: invoiceninja/invoiceninja-debian:${TAG:-latest}
+    image: invoiceninja/invoiceninja-octane:${TAG:-latest}
    restart: unless-stopped
    # php artisan help schedule:work
    command: --verbose
--- a/debian/scripts/init.sh
+++ b/debian/scripts/init.sh
@@ -46,30 +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/framework/sessions ] || mkdir -p /var/www/html/storage/framework/sessions
-        [ -d /var/www/html/storage/framework/views ] || mkdir -p /var/www/html/storage/framework/views
-        [ -d /var/www/html/storage/framework/cache ] || mkdir -p /var/www/html/storage/framework/cache
+        [ -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 migrate --force
+                frankenphp php-cli artisan db:seed --force

-        # 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..."
-
-            frankenphp php-cli artisan db:seed --force
-
-            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
+                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
        fi

--- a/docker/app/public/.keep
+++ b/docker/app/public/.keep
@@ -1 +0,0 @@
-
--- a/docker/app/storage/.keep
+++ b/docker/app/storage/.keep
@@ -1 +0,0 @@
-
Author	SHA1	Message	Date
David Bomba	ad2a8b35dc	Merge pull request #809 from benbrummer/octane Remove artisan package:discover	2025-09-30 07:07:17 +10:00
Benjamin Brummer	6f9de01d3b	matrix build with arm runners	2025-09-29 22:27:42 +02:00
Benjamin Brummer	fa5d522a36	Update upgrade instructions	2025-09-29 14:11:58 +02:00
Benjamin Brummer	84a42794d3	remove package discovery command from production setup	2025-09-29 14:08:50 +02:00
David Bomba	9cd585678c	Merge pull request #807 from benbrummer/octane Optimize artisan commands	2025-09-29 08:09:36 +10:00
Benjamin Brummer	8899d3e956	optimize artisan commands	2025-09-28 10:39:29 +02:00
Benjamin Brummer	f22c7b4f59	Increas start-period as first run might take a long time	2025-09-28 10:39:15 +02:00
David Bomba	d728221b0b	Merge pull request #796 from benbrummer/octane Create app/public	2025-09-09 07:31:43 +10:00
benbrummer	be451b454f	Create app/public Signed-off-by: benbrummer <info@benjamin-brummer.de>	2025-09-08 16:42:23 +02:00
David Bomba	184564e022	Merge pull request #795 from benbrummer/octane Use correct image for octane	2025-09-05 09:04:31 +10:00
Benjamin Brummer	2f31fc0da8	remove .gitignore and .editorconfig	2025-09-04 21:42:46 +02:00
Benjamin Brummer	7a37b9641d	remove folders for bind mounts	2025-09-04 21:42:13 +02:00
Benjamin Brummer	1917de0046	align APP_URL with docker-compose.yaml port	2025-09-04 21:35:36 +02:00
Benjamin Brummer	c9f91b4a45	use octane image in compose file	2025-09-04 21:34:52 +02:00
David Bomba	0117fbd93e	Merge pull request #791 from turbo124/octane Rollback to 8.4	2025-09-03 07:27:52 +10:00
David Bomba	fc7b94a223	Rollback to 8.4	2025-09-03 07:27:05 +10:00
David Bomba	281b6a15a4	Roll back to PHP 8.3	2025-09-02 18:54:36 +10:00
David Bomba	5e6d21646c	Merge pull request #788 from benbrummer/octane Workaround: Disable SSL for mariadb-client for compatibility with MySQL	2025-09-02 06:21:46 +10:00
benbrummer	17c1705fe7	Workaround: Disable SSL for mariadb-client for compatibility with MySQL Signed-off-by: benbrummer <info@benjamin-brummer.de>	2025-09-01 21:34:09 +02:00
David Bomba	9180712245	Merge pull request #785 from benbrummer/octane Debian Trixie and php 8.4	2025-08-29 22:02:11 +10:00
benbrummer	94582c4658	Debian Trixie and php 8.4 Signed-off-by: benbrummer <info@benjamin-brummer.de>	2025-08-29 12:57:23 +02:00
David Bomba	3e5035478d	Merge pull request #774 from stavros-k/patch-1 Fix init.sh for octane	2025-08-20 07:57:03 +10:00
Stavros Kois	4e80bc01d0	correct dir	2025-08-19 15:58:36 +03:00
Stavros Kois	6e73e3af9d	Update init.sh Makes sure the storage directory exists, otherwise it will fail with ```sh In ServerStateFile.php line 49: Unable to write to process ID file. ``` Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>	2025-08-11 12:56:27 +03:00
David Bomba	9944d43f0b	Merge pull request #765 from stavros-k/patch-1 Update init.sh	2025-07-07 08:42:59 +10:00
Stavros Kois	5eefcecf47	Update init.sh Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>	2025-07-03 13:57:12 +03:00