!LOCAL Add makefile for automating build and upload

Add entrypoint that calls envsubst ahead of starting nginx

Makefile

@@ -1,5 +1,5 @@
-REPOSITORY_PROXY   = dev.enpaul.net/skylab/nxcloud-proxy
+REPOSITORY_PROXY   = vcs.enp.one/skylab/nxcloud-proxy
-REPOSITORY_SERVER  = dev.enpaul.net/skylab/nxcloud-server
+REPOSITORY_SERVER  = vcs.enp.one/skylab/nxcloud-server
 
 
 .PHONY: help docs

docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - ./appdata/application:/var/www/html
       - ./appdata/data:/data
     environment:
-      - NEXTCLOUD_PHP_FPM_HOST=nxcloud-server-1:9000
+      - NEXTCLOUD_PHP_FPM_HOST=nxcloud-server-1
       - NEXTCLOUD_DOMAIN=localhost
       - NEXTCLOUD_MAX_UPLOAD_SIZE=4G
     networks:

nginx/nginx.conf.template

@@ -13,8 +13,8 @@ http {
     }
 
     server {
-        listen 80 http2;
+        listen 80;
-        listen [::]:80 http2;
+        listen [::]:80;
         # INFO: Set this to your domain
         server_name ${NEXTCLOUD_DOMAIN};
 
@@ -71,10 +71,10 @@ http {
         # and include that list explicitly or add the file extension
         # only for Nextcloud like below:
         include mime.types;
-        types {
+        #types {
-            text/javascript js mjs;
+        #    text/javascript js mjs;
-            application/wasm wasm;
+        #    application/wasm wasm;
-        }
+        #}
 
         # Specify how to handle directories -- specifying `/index.php$request_uri`
         # here as the fallback means that Nginx always exhibits the desired behaviour
@@ -154,7 +154,6 @@ http {
             fastcgi_request_buffering off;
 
             fastcgi_max_temp_file_size 0;
-            fastcgi_read_timeout 600;
         }
 
         # Serve static files

php-fpm/Dockerfile

@@ -55,16 +55,12 @@ RUN install-php-extensions \
     redis \
     imagick \
     sysvsem \
-    opcache \
+    opcache
-    pgsql
 
 
 # Copy optimized php.ini-development and production
 COPY ./php.ini-production /usr/local/etc/php/php.ini
 
-# Copy optimized php-fpm.ini
-COPY ./php-fpm.ini /usr/local/etc/php-fpm.d/zz-pm-tuning.conf
-
 # Set the working directory
 WORKDIR /var/www/html
 

php-fpm/php-fpm.ini

@@ -1,6 +0,0 @@
-pm = static
-pm.max_children = 800
-pm.start_servers = 200
-pm.min_spare_servers = 200
-pm.max_spare_servers = 600
-rlimit_files = 4096

php-fpm/php.ini-production

@@ -348,13 +348,13 @@ disable_classes =
 ; the file operations performed.
 ; Note: if open_basedir is set, the cache is disabled
 ; https://php.net/realpath-cache-size
-realpath_cache_size = 4096k
+;realpath_cache_size = 4096k
 
 ; 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.
 ; https://php.net/realpath-cache-ttl
-realpath_cache_ttl = 120
+;realpath_cache_ttl = 120
 
 ; Enables or disables the circular reference collector.
 ; https://php.net/zend.enable-gc
@@ -432,7 +432,7 @@ max_input_time = 60
 
 ; Maximum amount of memory a script may consume
 ; https://php.net/memory-limit
-memory_limit = 8G
+memory_limit = 2048M
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;
@@ -855,7 +855,7 @@ file_uploads = On
 upload_max_filesize = 10G
 
 ; Maximum number of files that can be uploaded via a single request
-max_file_uploads = 100
+max_file_uploads = 20
 
 ;;;;;;;;;;;;;;;;;;
 ; Fopen wrappers ;
@@ -1789,14 +1789,14 @@ opcache.enable=1
 opcache.enable_cli=1
 
 ; The OPcache shared memory storage size.
-opcache.memory_consumption=256
+opcache.memory_consumption=128
 
 ; The amount of memory for interned strings in Mbytes.
-opcache.interned_strings_buffer=24
+opcache.interned_strings_buffer=16
 
 ; The maximum number of keys (scripts) in the OPcache hash table.
 ; Only numbers between 200 and 1000000 are allowed.
-opcache.max_accelerated_files=10000
+opcache.max_accelerated_files=4000
 
 ; The maximum percentage of "wasted" memory until a restart is scheduled.
 ;opcache.max_wasted_percentage=5
@@ -1814,7 +1814,7 @@ opcache.validate_timestamps=1
 ; 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=1
+opcache.revalidate_freq=60
 
 ; Enables or disables file search in include_path optimization
 ;opcache.revalidate_path=0
@@ -1972,10 +1972,3 @@ opcache.save_comments=1
 
 ; List of headers files to preload, wildcard patterns allowed.
 ;ffi.preload=
-
-
-; Useful Nextcloud optimizations and additions
-apc.enable_cli=1
-opcache.jit_buffer_size = 128M
-opcache.jit = tracing
-opcache.jit = 1235