Merge pull request #705 from turbo124/master

Working on php extension installer issue

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

@@ -31,7 +31,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-4-${{ hashFiles('alpine/5/cache_buster') }}-${{ github.sha }}

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

@@ -31,7 +31,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-5-${{ hashFiles('alpine/5/cache_buster') }}-${{ github.sha }}
@@ -44,7 +44,7 @@ jobs:
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./alpine/5/
-          build-args: INVOICENINJA_VERSION=5-stable
+          build-args: INVOICENINJA_VERSION=5-develop
           target: prod
           platforms: linux/amd64,linux/arm64
           tags: invoiceninja/invoiceninja:cache
@@ -53,5 +53,6 @@ jobs:
 
       - name: Move cache
         run: |
+          mkdir -p /tmp/.buildx-cache
           rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.github/workflows/publish-image.yaml

@@ -45,7 +45,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.major }}-${{ hashFiles('alpine/${{ steps.prep.outputs.major }}/cache_buster') }}-${{ github.sha }}

.github/workflows/test-charts.yaml

@@ -12,7 +12,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -55,7 +55,7 @@ jobs:
           - "1.23.15"
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

README.md

@@ -2,7 +2,8 @@
 [![Docker image, latest](https://img.shields.io/docker/image-size/invoiceninja/invoiceninja/latest?label=latest)](https://hub.docker.com/r/invoiceninja/invoiceninja)
 [![Docker image, alpine](https://img.shields.io/docker/image-size/invoiceninja/invoiceninja/alpine?label=alpine)](https://hub.docker.com/r/invoiceninja/invoiceninja)
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/invoiceninja)](https://artifacthub.io/packages/search?repo=invoiceninja)
-[![Pusblish Image](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image.yaml) [![Cache v5 Image](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-v5.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-v5.yaml)
+[![Publish Image](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image.yaml)
+[![Cache v5 Image](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-v5.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-v5.yaml)
 
 # Docker for [Invoice Ninja](https://www.invoiceninja.com/)
 

alpine/5/Dockerfile

@@ -1,77 +1,67 @@
-ARG PHP_VERSION=8.1
+ARG PHP_VERSION=8.3
+ARG ALPINE_VERSION=3.20
 ARG BAK_STORAGE_PATH=/var/www/app/docker-backup-storage/
 ARG BAK_PUBLIC_PATH=/var/www/app/docker-backup-public/
 
 # Get Invoice Ninja and install nodejs packages
-FROM --platform=$BUILDPLATFORM node:lts-alpine as build
+FROM --platform=$BUILDPLATFORM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION}  AS nodebuild
 
 # Download Invoice Ninja
 ARG INVOICENINJA_VERSION
-ADD https://github.com/invoiceninja/invoiceninja/tarball/v$INVOICENINJA_VERSION /tmp/ninja.tar.gz
+ARG REPOSITORY=invoiceninja/invoiceninja
+ARG FILENAME=invoiceninja.tar
 
-RUN set -eux; apk add curl unzip
+RUN mkdir -p /var/www/app
 
 # Extract Invoice Ninja
-RUN mkdir -p /var/www/app \
-    && tar --strip-components=1 -xf /tmp/ninja.tar.gz -C /var/www/app/ \
-    && mkdir -p /var/www/app/public/logo /var/www/app/storage \
-    && mv /var/www/app/.env.example /var/www/app/.env \
-    && rm -rf /var/www/app/docs /var/www/app/tests
+RUN apk add --no-cache curl \
+    && curl -s "https://api.github.com/repos/invoiceninja/invoiceninja/releases/latest" | \
+    grep -o '"browser_download_url": "[^"]*invoiceninja.tar.gz"' | \
+    cut -d '"' -f 4 | \
+    xargs curl -sL | \
+    tar -xz --strip-components=1 -C /var/www/app/ \
+    && apk --purge del curl
 
-# Download and extract the latest react application
-RUN curl -LGO $(curl https://api.github.com/repos/invoiceninja/ui/releases/latest | grep "browser_download_url" | awk '{ print $2 }' | sed 's/,$//' | sed 's/"//g');
-RUN cp invoiceninja-react.zip /tmp/invoiceninja-react.zip
-RUN unzip /tmp/invoiceninja-react.zip 
-RUN cp -r dist/react/* /var/www/app/public/react/
-# Download and extract the latest react application
-# 
-WORKDIR /var/www/app/
+RUN mkdir -p /var/www/app/public/logo /var/www/app/storage
 
-# Install node packages
-ARG BAK_STORAGE_PATH
-ARG BAK_PUBLIC_PATH
-RUN --mount=target=/var/www/app/node_modules,type=cache \
-    npm install --production \
-    && npm run production \
-    && mv /var/www/app/storage $BAK_STORAGE_PATH \
-    && mv /var/www/app/public $BAK_PUBLIC_PATH  
+WORKDIR /var/www/app
 
 # Prepare php image
-FROM php:${PHP_VERSION}-fpm-alpine3.15 as prod
+FROM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION} AS phpbuild
 
 LABEL maintainer="David Bomba <turbo124@gmail.com>"
 
-# Adding caching_sha2_password.so
-# With this we get native support for caching_sha2_password
-RUN apk add --no-cache mariadb-connector-c
+ARG php_require="bcmath gd pdo_mysql zip mbstring"
+ARG php_suggest="exif imagick intl pcntl soap"
+ARG php_extra="opcache"
 
-RUN mv /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
-
-# Install PHP extensions
-# https://hub.docker.com/r/mlocati/php-extension-installer/tags
-COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
-
-RUN install-php-extensions \
-    bcmath \
-    exif \
-    gd \
-    gmp \
-    mysqli \
-    opcache \
-    pdo_mysql \
-    zip \
-    @composer \
-    && rm /usr/local/bin/install-php-extensions
+RUN ln -s "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini"
 
 # Install chromium
 RUN set -eux; \
     apk add --no-cache \
     font-isas-misc \
     supervisor \
-    mysql-client \
-    git \
+    mariadb-client \
+    mariadb-connector-c \
     chromium \
-    ttf-freefont
+    # font-noto-cjk-extra \
+    # font-wqy-zenhei \
+    ttf-freefont \
+    ttf-dejavu
+
+COPY --from=ghcr.io/mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
+
+RUN install-php-extensions \
+    ${php_require} \
+    ${php_suggest} \
+    ${php_extra}
+
+# Install PHP extensions
+# RUN ( curl -sSLf https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - || echo 'return 1' ) | sh -s \
+#     ${php_require} \
+#     ${php_suggest} \
+#     ${php_extra}
 
 # Copy files
 COPY rootfs /
@@ -88,6 +78,8 @@ RUN addgroup --gid=$UID -S "$INVOICENINJA_USER" \
     --ingroup "$INVOICENINJA_USER" \
     "$INVOICENINJA_USER"
 
+WORKDIR /var/www/app
+
 # Set up app
 ARG INVOICENINJA_VERSION
 ARG BAK_STORAGE_PATH
@@ -95,14 +87,28 @@ ARG BAK_PUBLIC_PATH
 ENV INVOICENINJA_VERSION $INVOICENINJA_VERSION
 ENV BAK_STORAGE_PATH $BAK_STORAGE_PATH
 ENV BAK_PUBLIC_PATH $BAK_PUBLIC_PATH
-COPY --from=build --chown=$INVOICENINJA_USER:$INVOICENINJA_USER /var/www/app /var/www/app
+COPY --from=nodebuild --chown=$INVOICENINJA_USER:$INVOICENINJA_USER /var/www/app /var/www/app
 
 USER $UID
 WORKDIR /var/www/app
 
 # Do not remove this ENV
 ENV IS_DOCKER true
-RUN /usr/local/bin/composer install --no-dev --quiet
+FROM --platform=$BUILDPLATFORM nodebuild AS dependencybuild
+
+WORKDIR /var/www/app
+COPY --from=phpbuild /var/www/app /var/www/app
+
+# # Install node packages
+ARG BAK_STORAGE_PATH
+ARG BAK_PUBLIC_PATH
+
+RUN mv /var/www/app/storage $BAK_STORAGE_PATH \
+    && mv /var/www/app/public $BAK_PUBLIC_PATH
+
+FROM phpbuild AS prod
+
+COPY --from=dependencybuild --chown=$INVOICENINJA_USER:$INVOICENINJA_USER /var/www/app /var/www/app
 
 # Override the environment settings from projects .env file
 ENV APP_ENV production

alpine/5/cache_buster

@@ -1 +1 @@
-Fri Jul  2 7:33:22 +00 2021
+Fri Jul  4 7:33:22 +00 2023

alpine/5/rootfs/docker-entrypoint-init.d/10-init-in.sh

@@ -11,5 +11,4 @@ if [[ ! -z "${IN_PASSWORD}" ]]; then
     password="--password ${IN_PASSWORD}"
 fi
 
-php artisan ninja:create-account $email $password
-php artisan ninja:react
+php artisan ninja:create-account $email $password

alpine/5/rootfs/etc/supervisord.conf

@@ -1,37 +1,36 @@
 [supervisord]
 nodaemon=true
-pidfile=/tmp/supervisord.pid
-logfile=/dev/null ; nodaemon will cause logs to go to stdout
+logfile=/dev/null
 logfile_maxbytes=0
-loglevel=info
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
 
 [program:php-fpm]
-redirect_stderr=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
 command=php-fpm
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+redirect_stderr=true
 
 [program:scheduler]
-autorestart=true
-redirect_stderr=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
 command=php artisan schedule:work
+autorestart=true
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+redirect_stderr=true
 
 [program:queue-worker]
 process_name=%(program_name)s_%(process_num)02d
+command=php artisan queue:work --sleep=3 --tries=1 --timeout=3600
+autostart=true
 autorestart=true
-redirect_stderr=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
+stopasgroup=true
+killasgroup=true
 numprocs=2
-command=php artisan queue:work --sleep=3 --tries=1 --memory=256 --timeout=3600
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+redirect_stderr=true
+stopwaitsecs=3600
 
 [eventlistener:shutdown]
 command=shutdown.sh

alpine/5/rootfs/usr/local/bin/invoiceninja-init.sh

@@ -27,10 +27,10 @@ docker_process_init_files() {
 
 php artisan config:cache
 php artisan optimize
-php artisan ninja:react
+php artisan package:discover
 
 # Check if DB works, if not crash the app.
-DB_READY=$(php artisan tinker --execute='echo app()->call("App\Utils\SystemHealth@dbCheck")["success"];')
+DB_READY=$(php -d opcache.preload='' artisan tinker --execute='echo app()->call("App\Utils\SystemHealth@dbCheck")["success"];')
 if [ "$DB_READY" != "1" ]; then
     php artisan migrate:status # Print verbose error
     in_error "Error connecting to DB"
@@ -39,7 +39,7 @@ fi
 php artisan migrate --force
 
 # If first IN run, it needs to be initialized
-IN_INIT=$(php artisan tinker --execute='echo Schema::hasTable("accounts") && !App\Models\Account::all()->first();')
+IN_INIT=$(php -d opcache.preload='' artisan tinker --execute='echo Schema::hasTable("accounts") && !App\Models\Account::all()->first();')
 if [ "$IN_INIT" == "1" ]; then
     docker_process_init_files /docker-entrypoint-init.d/*
 fi

alpine/5/rootfs/usr/local/etc/php-fpm.d/invoiceninja.conf

@@ -0,0 +1 @@
+pm.max_children = 10

alpine/5/rootfs/usr/local/etc/php/conf.d/in-php.ini

@@ -1,17 +0,0 @@
-; How often (in seconds) to check file timestamps for changes to the shared
-; memory storage allocation. ("1" means validate once per second, but only
-; once per request. "0" means always validate)
-;opcache.revalidate_freq=2
-opcache.revalidate_freq=60
-
-# http://symfony.com/doc/current/performance.html
-; Duration of time, in seconds for which to cache realpath information for a given
-; file or directory. For systems with rarely changing files, consider increasing this
-; value.
-; http://php.net/realpath-cache-ttl
-;realpath_cache_ttl = 120                                                                                                                        
-realpath_cache_ttl = 600
-
-; Maximum allowed size for uploaded files.                                                                                                                      
-; http://php.net/upload-max-filesize                                                                                                                            
-upload_max_filesize = 8M

alpine/5/rootfs/usr/local/etc/php/conf.d/invoiceninja.ini

@@ -0,0 +1,22 @@
+[core]
+; 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
+opcache.enable_cli=1
+
+[jit]
+; https://wiki.php.net/rfc/jit_config_defaults
+opcache.jit=tracing
+opcache.jit_buffer_size=64M
+
+[extra]
+; http://symfony.com/doc/current/performance.html
+opcache.memory_consumption=256
+opcache.max_accelerated_files=20000
+opcache.preload=/var/www/app/preload.php
+opcache.validate_timestamps=0
+realpath_cache_size=4096K
+realpath_cache_ttl=600

charts/invoiceninja/Chart.yaml

@@ -13,11 +13,11 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.10.1
+version: 0.10.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 5.5.49
+appVersion: 5.6.24
 keywords:
   - invoiceninja
 home: https://invoiceninja.github.io/dockerfiles

charts/invoiceninja/values.yaml

@@ -18,7 +18,7 @@
 image:
   registry: docker.io
   repository: invoiceninja/invoiceninja
-  tag: 5.5.49
+  tag: 5.6.24
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
   ##

config/nginx/invoiceninja.conf

@@ -0,0 +1,14 @@
+# https://nginx.org/en/docs/http/ngx_http_core_module.html
+client_max_body_size 10M;
+client_body_buffer_size 10M;
+server_tokens off;
+
+# https://nginx.org/en/docs/http/ngx_http_fastcgi_module.html
+fastcgi_buffers 32 16K;
+
+# https://nginx.org/en/docs/http/ngx_http_gzip_module.html
+gzip on;
+gzip_comp_level 2;
+gzip_min_length 1M;
+gzip_proxied any;
+gzip_types *;

config/nginx/laravel.conf

@@ -1,29 +1,32 @@
+# https://laravel.com/docs/master/deployment#nginx
 server {
     listen 80 default_server;
-    server_name _;
-    
-    server_tokens off;
-    
-    client_max_body_size 100M;
+    server_name _;   
+    root /var/www/app/public;
+
+    add_header X-Frame-Options "SAMEORIGIN";
+    add_header X-Content-Type-Options "nosniff";
 
-    root /var/www/app/public/;
     index index.php;
-
+ 
+    charset utf-8;
+ 
     location / {
         try_files $uri $uri/ /index.php?$query_string;
     }
-
+ 
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }
+ 
+    error_page 404 /index.php;
 
     location ~ \.php$ {
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass app:9000;
-        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
         include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_intercept_errors off;
-        fastcgi_buffer_size 16k;
-        fastcgi_buffers 4 16k;
+    }
+
+    location ~ /\.(?!well-known).* {
+        deny all;
     }
 }

config/php/php-fpm.conf

@@ -0,0 +1 @@
+pm.max_children = 10

config/php/php.ini

@@ -0,0 +1,22 @@
+[core]
+; 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
+opcache.enable_cli=1
+
+[jit]
+; https://wiki.php.net/rfc/jit_config_defaults
+opcache.jit=tracing
+opcache.jit_buffer_size=64M
+
+[extra]
+; http://symfony.com/doc/current/performance.html
+opcache.memory_consumption=256
+opcache.max_accelerated_files=20000
+opcache.preload=/var/www/app/preload.php
+opcache.validate_timestamps=0
+realpath_cache_size=4096K
+realpath_cache_ttl=600

docker-compose.yml

@@ -1,14 +1,12 @@
-version: '3.7'
-
 services:
-  server:
+  nginx:
     image: nginx
     restart: always
     env_file: env
     volumes:
       # Vhost configuration
       #- ./config/caddy/Caddyfile:/etc/caddy/Caddyfiledocker-com
-      - ./config/nginx/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf:ro
+      - ./config/nginx:/etc/nginx/conf.d:ro
       - ./docker/app/public:/var/www/app/public:ro
     depends_on:
       - app
@@ -17,25 +15,27 @@ services:
     ports:
       - "80:80"
       #- "443:443"
-    networks:
-      - invoiceninja
-    extra_hosts:
-      - "in5.localhost:192.168.0.124 " #host and ip
+    # extra_hosts:
+    #   - "in5.localhost:192.168.0.124 " #host and ip
 
   app:
-    image: invoiceninja/invoiceninja:5
+    build:
+      context: ./alpine/5
+    image: invoiceninja/invoiceninja:${TAG:-5}
     env_file: env
     restart: always
     volumes:
-      - ./config/hosts:/etc/hosts:ro
+      # - ./config/hosts:/etc/hosts:ro
       - ./docker/app/public:/var/www/app/public:rw,delegated
       - ./docker/app/storage:/var/www/app/storage:rw,delegated
+      # - ./config/php/php.ini:/usr/local/etc/php/conf.d/invoiceninja.ini
+      # - ./config/php/php-fpm.conf:/usr/local/etc/php-fpm.d/invoiceninja.conf
+
     depends_on:
       - db
-    networks:
-      - invoiceninja
-    extra_hosts:
-      - "in5.localhost:192.168.0.124 " #host and ip
+      - valkey
+    # extra_hosts:
+    #   - "in5.localhost:192.168.0.124 " #host and ip
 
   db:
     image: mysql:8
@@ -44,8 +44,6 @@ services:
 #    For auto DB backups comment out image and use the build block below
 #    build:
 #      context: ./config/mysql
-    ports:
-      - "3305:3306"
     restart: always
     env_file: env
     volumes:
@@ -56,10 +54,8 @@ services:
       #- ./config/mysql/backup-script:/etc/cron.daily/daily:ro
       #- ./config/mysql/backup-script:/etc/cron.weekly/weekly:ro
       #- ./config/mysql/backup-script:/etc/cron.monthly/monthly:ro
-    networks:
-      - invoiceninja
-    extra_hosts:
-      - "in5.localhost:192.168.0.124 " #host and ip
+    # extra_hosts:
+    #   - "in5.localhost:192.168.0.124 " #host and ip
 
   # THIS IS ONLY A VALID CONFIGURATION FOR IN 4. DO NOT USE FOR IN 5.
   # cron:
@@ -81,6 +77,9 @@ services:
   #   networks:
   #     - invoiceninja
   #
-
-networks:
-  invoiceninja:
+  valkey:
+    image: valkey/valkey:8
+    restart: unless-stopped
+    healthcheck:
+      test: [ "CMD", "valkey-cli", "ping" ]
+      start_period: 10s

env

@@ -7,8 +7,13 @@ PHANTOMJS_PDF_GENERATION=false
 PDF_GENERATOR=snappdf
 TRUSTED_PROXIES='*'
 
+CACHE_DRIVER=redis
+QUEUE_CONNECTION=redis
+SESSION_DRIVER=redis
 
-QUEUE_CONNECTION=database
+REDIS_HOST=valkey
+REDIS_PASSWORD=null
+REDIS_PORT=6379
 
 # DB connection
 DB_HOST=db
@@ -40,6 +45,10 @@ MYSQL_USER=ninja
 MYSQL_PASSWORD=ninja
 MYSQL_DATABASE=ninja
 
+# GoCardless/Nordigen API key for banking integration
+NORDIGEN_SECRET_ID=
+NORDIGEN_SECRET_KEY=
+
 # V4 env vars
 # DB_STRICT=false
 # APP_CIPHER=AES-256-CBC