Revert "Align alpine to debian and octane for maintenance"

alpine/5/rootfs/etc/supervisord.conf

@@ -1,36 +1,37 @@
 [supervisord]
 nodaemon=true
-logfile=/dev/null
+pidfile=/tmp/supervisord.pid
+logfile=/dev/null ; nodaemon will cause logs to go to stdout
 logfile_maxbytes=0
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
+loglevel=info
 
 [program:php-fpm]
-command=php-fpm
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
 redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=php-fpm
 
 [program:scheduler]
-command=php artisan schedule:work
 autorestart=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
 redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=php artisan schedule:work
 
 [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
-stopasgroup=true
-killasgroup=true
-numprocs=2
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
 redirect_stderr=true
-stopwaitsecs=3600
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+numprocs=2
+command=php artisan queue:work --sleep=3 --tries=1 --memory=256 --timeout=3600
 
 [eventlistener:shutdown]
 command=shutdown.sh

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

@@ -30,7 +30,7 @@ php artisan optimize
 php artisan package:discover
 
 # Check if DB works, if not crash the app.
-DB_READY=$(php -d opcache.preload='' artisan tinker --execute='echo app()->call("App\Utils\SystemHealth@dbCheck")["success"];')
+DB_READY=$(php 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 -d opcache.preload='' artisan tinker --execute='echo Schema::hasTable("accounts") && !App\Models\Account::all()->first();')
+IN_INIT=$(php 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

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

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

@@ -0,0 +1,17 @@
+; 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

@@ -1,22 +0,0 @@
-[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