saulteafarmer/castopod
1
0
Fork 0
mirror of https://code.castopod.org/adaures/castopod synced 2025-05-24 19:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Romain de Laage 2023-06-26 11:24:45 +02:00
parent 3fee88ae6e
commit 233ece4b3a
No known key found for this signature in database
GPG Key ID: B6B8919924DFF30B
7 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/production/app/Dockerfile
View File

@ -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/common/prepare_environment.sh /prepare_environment.sh
COPY docker/production/app/entrypoint.sh /entrypoint.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/common/crontab.txt /crontab.txt
COPY docker/production/app/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY docker/production/app/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY castopod /var/www/castopod COPY castopod /var/www/castopod

1
docker/production/app/entrypoint.sh
View File

@ -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 chown -R www-data:www-data /var/www/castopod/writable /var/www/castopod/public/media
. /prepare_environment.sh . /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 supervisord

1
docker/production/castopod/Dockerfile
View File

@ -37,6 +37,7 @@ COPY docker/production/common/prepare_environment.sh /prepare_environment.sh
COPY docker/production/castopod/entrypoint.sh /entrypoint.sh COPY docker/production/castopod/entrypoint.sh /entrypoint.sh
COPY castopod /var/www/castopod COPY castopod /var/www/castopod
COPY docker/production/castopod/config.template.json /config.template.json 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/common/crontab.txt /crontab.txt
COPY docker/production/castopod/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY docker/production/castopod/supervisord.conf /etc/supervisor/conf.d/supervisord.conf

12
docker/production/castopod/config.template.json
View File

@ -18,17 +18,7 @@
"castopod": { "castopod": {
"type": "php", "type": "php",
"root": "/var/www/castopod/public/", "root": "/var/www/castopod/public/",
"script": "index.php", "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"
}
}
} }
}, },
"access_log": { "access_log": {

2
docker/production/castopod/entrypoint.sh
View File

@ -3,7 +3,7 @@
ENV_FILE_LOCATION=/var/www/castopod/.env ENV_FILE_LOCATION=/var/www/castopod/.env
. /prepare_environment.sh . /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 #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/) & (sleep 2 && curl -X PUT --data-binary @/config.json --unix-socket /var/run/control.unit.sock http://localhost/config/) &

3
docker/production/common/prepare_environment.sh
View File

@ -287,3 +287,6 @@ cat $ENV_FILE_LOCATION
#Run database migrations after 10 seconds (to wait for the database to be started) #Run database migrations after 10 seconds (to wait for the database to be started)
(sleep 10 && php spark castopod:database-update) & (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

0
docker/production/app/uploads.template.ini → docker/production/common/uploads.template.ini
View File