build(docker): use common PHP configuration for Nginx Unit and FPM images

docker/production/app/Dockerfile

@@ -17,7 +17,7 @@ COPY --from=CRON_BUILDER /usr/local/bin/supercronic /usr/local/bin/supercronic
 
 COPY docker/production/common/prepare_environment.sh /prepare_environment.sh
 COPY docker/production/app/entrypoint.sh /entrypoint.sh
-COPY docker/production/app/uploads.template.ini /uploads.template.ini
+COPY docker/production/common/uploads.template.ini /uploads.template.ini
 COPY docker/production/common/crontab.txt /crontab.txt
 COPY docker/production/app/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY castopod /var/www/castopod

docker/production/app/entrypoint.sh

@@ -8,6 +8,5 @@ chown -R root:www-data /var/www/castopod
 chown -R www-data:www-data /var/www/castopod/writable /var/www/castopod/public/media
 
 . /prepare_environment.sh
-cat /uploads.template.ini | envsubst '$CP_MAX_BODY_SIZE$CP_MAX_BODY_SIZE_BYTES$CP_TIMEOUT$CP_PHP_MEMORY_LIMIT' > /usr/local/etc/php/conf.d/uploads.ini
 
 supervisord

docker/production/castopod/Dockerfile

@@ -37,6 +37,7 @@ COPY docker/production/common/prepare_environment.sh /prepare_environment.sh
 COPY docker/production/castopod/entrypoint.sh /entrypoint.sh
 COPY castopod /var/www/castopod
 COPY docker/production/castopod/config.template.json /config.template.json
+COPY docker/production/common/uploads.template.ini /uploads.template.ini
 COPY docker/production/common/crontab.txt /crontab.txt
 COPY docker/production/castopod/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 

docker/production/castopod/config.template.json

@@ -18,17 +18,7 @@
     "castopod": {
       "type": "php",
       "root": "/var/www/castopod/public/",
-      "script": "index.php",
-      "options": {
-        "admin": {
-          "file_uploads": "On",
-          "memory_limit": "$CP_PHP_MEMORY_LIMIT",
-          "upload_max_filesize": "$CP_MAX_BODY_SIZE",
-          "post_max_size": "$CP_MAX_BODY_SIZE",
-          "max_execution_time": "$CP_TIMEOUT",
-          "max_input_time": "$CP_TIMEOUT"
-        }
-      }
+      "script": "index.php"
     }
   },
   "access_log": {

docker/production/castopod/entrypoint.sh

@@ -3,7 +3,7 @@
 ENV_FILE_LOCATION=/var/www/castopod/.env
 
 . /prepare_environment.sh
-cat /config.template.json | envsubst '$CP_MAX_BODY_SIZE$CP_MAX_BODY_SIZE_BYTES$CP_TIMEOUT$CP_PHP_MEMORY_LIMIT' > /config.json
+cat /config.template.json | envsubst '$CP_MAX_BODY_SIZE_BYTES$CP_TIMEOUT' > /config.json
 
 #Apply configuration after unit is started
 (sleep 2 && curl -X PUT --data-binary @/config.json --unix-socket /var/run/control.unit.sock http://localhost/config/) &

docker/production/common/prepare_environment.sh

@@ -287,3 +287,6 @@ cat $ENV_FILE_LOCATION
 
 #Run database migrations after 10 seconds (to wait for the database to be started)
 (sleep 10 && php spark castopod:database-update) &
+
+#Apply php configuration
+cat /uploads.template.ini | envsubst '$CP_MAX_BODY_SIZE$CP_MAX_BODY_SIZE_BYTES$CP_TIMEOUT$CP_PHP_MEMORY_LIMIT' > /usr/local/etc/php/conf.d/uploads.ini