From 02dfda3b2b11280b72f5074179275eac93ece65b Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 1 Nov 2016 15:15:57 +0000 Subject: [PATCH 1/3] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 751f1e1..9440488 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM thallian/confd-env:latest +FROM quay.io/thallian/confd-env:latest RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community/ --allow-untrusted php7-fpm From 100ce0aeed59a730c0819f97e02208c95c92bcc2 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 1 Nov 2016 15:20:03 +0000 Subject: [PATCH 2/3] Update www.conf.tmpl --- rootfs/etc/confd/templates/www.conf.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootfs/etc/confd/templates/www.conf.tmpl b/rootfs/etc/confd/templates/www.conf.tmpl index 10653f3..fbf807f 100644 --- a/rootfs/etc/confd/templates/www.conf.tmpl +++ b/rootfs/etc/confd/templates/www.conf.tmpl @@ -424,8 +424,8 @@ env[PATH] = /usr/local/bin:/usr/bin:/bin php_admin_value[default_charset] = UTF-8 {{if (getenv "MAXUPLOADSIZE")}} -php_admin_value[upload_max_filesize] = {{getenv "MAXUPLOADSIZE"}} -php_admin_value[post_max_size] = {{getenv "MAXUPLOADSIZE"}} +php_admin_value[upload_max_filesize] = {{getenv "MAX_UPLOAD_SIZE" "512M"}} +php_admin_value[post_max_size] = {{getenv "MAX_UPLOAD_SIZE" "512M"}} {{end}} {{if (getenv "PHP_ADMIN_VALUES")}} From 4c9766fcd3b0faad36c7e98cd08198a81e43ddff Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 1 Nov 2016 15:20:39 +0000 Subject: [PATCH 3/3] Add new file --- README.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..6d4f655 --- /dev/null +++ b/README.md @@ -0,0 +1,28 @@ +[php-fpm](https://php-fpm.org/) with php7. + +# Environment Variables +## FPMUSER +- default: nobody + +The user which runs the fpm process. + +## FPMGROUP +- default: nobody + +The group which runs the fpm process. + +## MAX_UPLOAD_SIZE +- default: 512M + +Maximal upload size. + +## PHP_ADMIN_VALUES +Comma seperated list of php admin values. + +Each element is a key-value pair, seperated by an equal sign. + + +## PHP_ADMIN_FLAGS +Comma seperated list of php admin flags. + +Each element is a key-value pair, seperated by an equal sign.