Merge pull request #752 from benbrummer/octane

saxon defaults now to 12.5.0

debian/.env

@@ -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,10 +1,11 @@
-FROM dunglas/frankenphp:1-php8.3-bookworm AS prepare-app
+ARG PHP_VERSION=8.3
+ARG FRANKENPHP_VERSION=1
+ARG DEBIAN_VERSION=bookworm
 
-RUN curl -s "https://api.github.com/repos/invoiceninja/invoiceninja/releases/latest" | \
+FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php${PHP_VERSION}-${DEBIAN_VERSION} AS prepare-app
-    grep -o '"browser_download_url": "[^"]*invoiceninja.tar.gz"' | \
+
-    cut -d '"' -f 4 | \
+RUN curl -sL "https://github.com/invoiceninja/invoiceninja/releases/latest/download/invoiceninja.tar.gz" | \
-    xargs curl -sL | \
+    tar -xz \
-    tar -xz --strip-components=1 \
     && ln -s ./resources/views/react/index.blade.php ./public/index.html \
     # Symlink
     && php artisan storage:link \
@@ -14,13 +15,13 @@ RUN curl -s "https://api.github.com/repos/invoiceninja/invoiceninja/releases/lat
 # ==================
 # 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_require="bcmath gd mbstring pdo_mysql zip"
-ARG php_suggest="exif imagick intl pcntl soap saxon-12.5.0"
+ARG php_suggest="exif imagick intl pcntl saxon soap"
 ARG php_extra="opcache"
 
 # Create a system user UID/GID=999
@@ -88,6 +89,8 @@ COPY --chmod=0755 scripts/init.sh /usr/local/bin/init.sh
 
 USER ${user}
 
+HEALTHCHECK --start-period=10s CMD curl -f http://localhost/health
+
 ENTRYPOINT ["/usr/local/bin/init.sh"]
 
 CMD ["frankenphp", "php-cli", "artisan", "octane:frankenphp"]

debian/docker-compose.yml

@@ -9,7 +9,6 @@ x-logging: &default-logging
 x-app-volumes: &volumes
   volumes:
       - ./.env:/app/.env
-      - app_cache:/var/www/html/bootstrap/cache
       - app_storage:/app/storage
       - caddy_data:/data
 
@@ -31,9 +30,6 @@ services:
     environment:
       LARAVEL_ROLE: app
     <<: *volumes
-    # HEALTHCHECK from frankenphp image
-    healthcheck:
-      start_period: 180s
     depends_on:
       mysql:
         condition: service_healthy
@@ -143,7 +139,6 @@ services:
   #   logging: *default-logging
 
 volumes:
-  app_cache:
   app_storage:
   caddy_data:
   mysql_data:

debian/scripts/init.sh

@@ -3,6 +3,12 @@
 # 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
 
@@ -38,6 +44,12 @@ if [ "$*" = 'frankenphp php-cli artisan octane:frankenphp' ] || [ "${1#-}" != "$
     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/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
+
         if [ "$APP_ENV" = "production" ]; then
             frankenphp php-cli artisan optimize
         fi
@@ -48,7 +60,7 @@ if [ "$*" = 'frankenphp php-cli artisan octane:frankenphp' ] || [ "${1#-}" != "$
         frankenphp php-cli artisan migrate --force
 
         # If first IN run, it needs to be initialized
-        if [ "$(php -d opcache.preload='' artisan tinker --execute='echo Schema::hasTable("accounts") && !App\Models\Account::all()->first();')" = "1" ]; then
+        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