Merge pull request #809 from benbrummer/octane

Remove artisan package:discover

.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
-

.github/workflows/build-image-debian.yaml

@@ -1,4 +1,4 @@
-name: Build Debian OctaneContainer Image
+name: Build Debian Octane Container Image
 
 on:
   pull_request:
@@ -12,15 +12,14 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    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

.github/workflows/publish-image.yaml

@@ -7,16 +7,18 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    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
+            context: debian
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4  # Updated from v2
+        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 }}

.gitignore

@@ -1,14 +0,0 @@
-# OS files
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
-
-# Helm
-charts/**/charts/
-
-# Compose filesystem
-/docker

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/.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
@@ -57,6 +57,6 @@ NORDIGEN_SECRET_KEY=
 
 IS_DOCKER=true
 SCOUT_DRIVER=null
-SNAPPDF_CHROMIUM_PATH=/usr/bin/google-chrome-stable
+#SNAPPDF_CHROMIUM_PATH=/usr/bin/google-chrome-stable
 
 

debian/Dockerfile

@@ -1,38 +1,27 @@
-FROM composer:latest AS composer
+ARG PHP_VERSION=8.4
+ARG FRANKENPHP_VERSION=1
+ARG DEBIAN_VERSION=trixie
 
-RUN curl -s "https://api.github.com/repos/invoiceninja/invoiceninja/releases/latest" | \
-    grep -o '"browser_download_url": "[^"]*invoiceninja.tar"' | \
-    cut -d '"' -f 4 | \
-    xargs curl -sL | \
-    tar -xz
+FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php${PHP_VERSION}-${DEBIAN_VERSION} AS prepare-app
 
-RUN ln -s ./resources/views/react/index.blade.php ./public/index.html
-
-# Set permissions: directories 755, files 644
-RUN chmod -R a=r,u+w,a+X .
-
-# Install dependencies
-RUN composer install --no-dev --no-scripts --no-autoloader --ignore-platform-reqs
-
-RUN composer require laravel/octane --ignore-platform-reqs
-
-RUN composer dump-autoload --optimize
-
-RUN php artisan storage:link
-
-# Octane
-RUN php artisan octane:install --server=frankenphp
+RUN curl -sL "https://github.com/invoiceninja/invoiceninja/releases/latest/download/invoiceninja.tar.gz" | \
+    tar -xz \
+    && ln -s ./resources/views/react/index.blade.php ./public/index.html \
+    # Symlink
+    && php artisan storage:link \
+    # Octane
+    && php artisan octane:install --server=frankenphp
 
 # ==================
 # InvoiceNinja image
 # ==================
-FROM dunglas/frankenphp:1-php8.3-bookworm
+FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php${PHP_VERSION}-${DEBIAN_VERSION}
 
 ARG user=ninja
 
 # PHP modules
-ARG php_require="bcmath gd pdo_mysql zip"
-ARG php_suggest="exif imagick intl pcntl soap saxon-12.5.0"
+ARG php_require="bcmath gd mbstring pdo_mysql zip"
+ARG php_suggest="exif imagick intl pcntl saxon soap"
 ARG php_extra="opcache"
 
 # Create a system user UID/GID=999
@@ -79,7 +68,12 @@ RUN install-php-extensions \
     ${php_extra}
 
 # Configure PHP
-RUN mv "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini"
+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 \
@@ -90,14 +84,16 @@ RUN chown -R ${user}: \
     /data/caddy \
     /config/caddy
 
-ENTRYPOINT ["/usr/local/bin/init.sh"]
-
-CMD ["frankenphp", "php-cli", "artisan", "octane:frankenphp"]
-
 # InvoiceNinja
-COPY --from=composer --chown=${user}:${user} /app /app
+COPY --from=prepare-app --chown=${user}:${user} /app /app
 
 # Add initialization script
 COPY --chmod=0755 scripts/init.sh /usr/local/bin/init.sh
 
 USER ${user}
+
+HEALTHCHECK --start-period=100s CMD curl -f http://localhost/health
+
+ENTRYPOINT ["/usr/local/bin/init.sh"]
+
+CMD ["frankenphp", "php-cli", "artisan", "octane:frankenphp"]

debian/docker-compose.yml

@@ -9,28 +9,27 @@ x-logging: &default-logging
 x-app-volumes: &volumes
   volumes:
       - ./.env:/app/.env
-      - ./php/php.ini:/usr/local/etc/php/conf.d/zzz-php.ini:ro
-      - app_cache:/var/www/html/bootstrap/cache
       - app_storage:/app/storage
+      - caddy_data:/data
 
 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: --log-level=info
+    command: --port=80 --workers=2 --log-level=info
+    # command: --host=example.com --port=443 --workers=2 --https --http-redirect --log-level=info
     ports:
-      - "80:8000"
+      - "80:80" # HTTP
+      # - "443:443" # HTTPS
+      # - "443:443/udp" # HTTP/3, Works for chromium based browser, but causes H3_GENERAL_PROTOCOL_ERROR for pdf previews in Firefox 
     env_file:
       - ./.env
     environment:
       LARAVEL_ROLE: app
     <<: *volumes
-    # HEALTHCHECK from frankenphp image
-    healthcheck:
-      start_period: 180s
     depends_on:
       mysql:
         condition: service_healthy
@@ -43,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
@@ -55,13 +54,16 @@ services:
     environment:
       LARAVEL_ROLE: worker
     <<: *volumes
+    healthcheck:
+      test: ["CMD", "pgrep", "-f", "queue:work"]
+      start_period: 10s
     depends_on:
       app:
         condition: service_healthy
     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
@@ -70,6 +72,9 @@ services:
     environment:
       LARAVEL_ROLE: scheduler
     <<: *volumes
+    healthcheck:
+      test: ["CMD", "pgrep", "-f", "schedule:work"]
+      start_period: 10s
     depends_on:
       app:
         condition: service_healthy
@@ -134,15 +139,9 @@ services:
   #   logging: *default-logging
 
 volumes:
-  app_cache:
-    driver: local
   app_storage:
-    driver: local
+  caddy_data:
   mysql_data:
-    driver: local
   redis_data:
-    driver: local
   # mariadb:
-  #   driver: local
   # valkey:
-  #   driver: local

debian/php/php.ini

@@ -1,15 +1,23 @@
 [core]
-# https://www.php.net/manual/en/ini.core.php
-post_max_size = 10M
-upload_max_filesize = 10M
+; https://www.php.net/manual/en/ini.core.php
+post_max_size=10M
+upload_max_filesize=10M
 
 [opcache]
-# https://www.php.net/manual/en/opcache.installation.php#opcache.installation.recommended
+; https://www.php.net/manual/en/opcache.installation.php#opcache.installation.recommended
 opcache.enable_cli=1
-opcache.max_accelerated_files=4000
-opcache.revalidate_freq=60
 
 [jit]
-# https://wiki.php.net/rfc/jit_config_defaults
+; https://wiki.php.net/rfc/jit_config_defaults
 opcache.jit=tracing
 opcache.jit_buffer_size=64M
+
+[extra]
+; https://frankenphp.dev/docs/performance/#php-performance
+; http://symfony.com/doc/current/performance.html
+opcache.memory_consumption=256
+opcache.max_accelerated_files=20000
+opcache.preload=/app/preload.php
+opcache.validate_timestamps=0
+realpath_cache_size = 4096K
+realpath_cache_ttl = 600

debian/scripts/init.sh

@@ -3,33 +3,73 @@
 # Fallback to app
 role=${LARAVEL_ROLE:-app}
 
+# Set PDF generation browser path based on architecture
+export SNAPPDF_CHROMIUM_PATH=/usr/bin/google-chrome-stable
+if [ "$(dpkg --print-architecture)" = "arm64" ]; then
+    export SNAPPDF_CHROMIUM_PATH=/usr/bin/chromium
+fi
+
 # Check for default CMD, flag(s) or empty CMD
 if [ "$*" = 'frankenphp php-cli artisan octane:frankenphp' ] || [ "${1#-}" != "$1" ] || [ "$#" -eq  "0" ]; then
 
+    if [ "--help" = "$1" ]; then
+        echo [CMD]
+        echo "This image will execute specific CMDs based on the environment variable LARAVEL_ROLE"
+        echo
+        echo "LARAVEL_ROLE=app:       frankenphp php-cli artisan octane:frankenphp (default)"
+        echo "LARAVEL_ROLE=worker:    frankenphp php-cli artisan queue:work"
+        echo "LARAVEL_ROLE=scheduler: frankenphp php-cli artisan schedule:work"
+        echo
+        echo [FLAGS]
+        echo To the CMD defined by LARAVEL_ROLE can be extended with flags for artisan commands
+        echo
+        echo Available flags can be displaced:
+        echo docker run --rm invoiceninja/invoiceninja-debian frankenphp php-cli artisan help octane:frankenphp
+        echo docker run --rm invoiceninja/invoiceninja-debian frankenphp php-cli artisan queue:work
+        echo docker run --rm invoiceninja/invoiceninja-debian frankenphp php-cli artisan schedule:work
+        echo
+        echo Example:
+        echo docker run -e LARAVEL_ROLE=worker invoiceninja/invoiceninja-debian --verbose --sleep=3 --tries=3 --max-time=3600
+        echo
+        echo [Deployment]
+        echo Docker compose is recommended
+        echo
+        echo Example:
+        echo https://github.com/invoiceninja/dockerfiles/blob/octane/debian/docker-compose.yml
+        echo
+        exit 0
+    fi
+
     # Run app
     if [ "${role}" = "app" ]; then
         cmd="frankenphp php-cli artisan octane:frankenphp"
 
+        # 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 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
 

docker/app/public/.keep

@@ -1 +0,0 @@
-

docker/app/storage/.keep

@@ -1 +0,0 @@
-