Merge pull request #795 from benbrummer/octane

Use correct image for octane

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

.gitignore

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

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,4 +1,8 @@
-FROM dunglas/frankenphp:1-php8.3-bookworm AS prepare-app
+ARG PHP_VERSION=8.4
+ARG FRANKENPHP_VERSION=1
+ARG DEBIAN_VERSION=trixie
+
+FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php${PHP_VERSION}-${DEBIAN_VERSION} AS prepare-app
 
 RUN curl -sL "https://github.com/invoiceninja/invoiceninja/releases/latest/download/invoiceninja.tar.gz" | \
     tar -xz \
@@ -11,13 +15,13 @@ RUN curl -sL "https://github.com/invoiceninja/invoiceninja/releases/latest/downl
 # ==================
 # 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 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
@@ -68,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
@@ -85,6 +92,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
 
@@ -17,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
@@ -31,9 +30,6 @@ services:
     environment:
       LARAVEL_ROLE: app
     <<: *volumes
-    # HEALTHCHECK from frankenphp image
-    healthcheck:
-      start_period: 180s
     depends_on:
       mysql:
         condition: service_healthy
@@ -46,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
@@ -67,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
@@ -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,13 @@ 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 /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 optimize
         fi
@@ -48,7 +61,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

docker/app/public/.keep

@@ -1 +0,0 @@
-

docker/app/storage/.keep

@@ -1 +0,0 @@
-