From 2dbcac3798bf2a69a6ad6476c234b649f7d20ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= <jcgruenhage@matrix.org>
Date: Tue, 17 Apr 2018 14:57:36 +0100
Subject: [PATCH] feat: make more things configurable with env vars

---
 Dockerfile                 |  1 +
 root/etc/Caddyfile         |  3 ++-
 root/etc/php7/php-fpm.conf | 15 +++++++++++++--
 root/etc/s6.d/caddy/run    |  1 +
 root/etc/s6.d/php/run      |  5 ++++-
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 72e3206..8404980 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
 FROM docker.jcg.re/base-caddy
+ENV APPDIR=/phpapp
 RUN apk add --no-cache \
       php7-fpm
 ADD root /
diff --git a/root/etc/Caddyfile b/root/etc/Caddyfile
index 550e098..e4816d9 100644
--- a/root/etc/Caddyfile
+++ b/root/etc/Caddyfile
@@ -1,3 +1,4 @@
 :8888 
-root /phpapp
+root <APPDIR>
 fastcgi / /tmp/php-fpm.sock php
+log stdout
diff --git a/root/etc/php7/php-fpm.conf b/root/etc/php7/php-fpm.conf
index f636044..5690ee8 100644
--- a/root/etc/php7/php-fpm.conf
+++ b/root/etc/php7/php-fpm.conf
@@ -1,11 +1,22 @@
 [global]
 daemonize = no
+error_log = /var/log/php7/error.log
 
 [www]
 listen = /tmp/php-fpm.sock
 pm = dynamic
-pm.max_children = 5
+pm.max_children = 15
 pm.start_servers = 2
 pm.min_spare_servers = 1
-pm.max_spare_servers = 3
+pm.max_spare_servers = 6
 chdir = /
+request_terminate_timeout = 0
+env[PATH] = /usr/local/bin:/usr/bin:/bin
+php_admin_value[post_max_size] = <UPLOAD_MAX_SIZE>
+php_admin_value[upload_max_filesize] = <UPLOAD_MAX_SIZE>
+php_admin_value[max_execution_time] = 10800
+php_admin_value[max_input_time] = 3600
+php_admin_value[expose_php] = Off
+php_admin_value[memory_limit] = <MEMORY_LIMIT>
+php_admin_value[session.save_path] = "/tmp/php-session"
+php_admin_value[display_errors] = <DISPLAY_ERRORS>
diff --git a/root/etc/s6.d/caddy/run b/root/etc/s6.d/caddy/run
index de622be..e3b83f0 100755
--- a/root/etc/s6.d/caddy/run
+++ b/root/etc/s6.d/caddy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e "s#<APPDIR>#${APPDIR}#" /etc/Caddyfile
 su-exec ${UID}:${GID} caddy --conf /etc/Caddyfile
diff --git a/root/etc/s6.d/php/run b/root/etc/s6.d/php/run
index 24acdd7..72ccb7e 100755
--- a/root/etc/s6.d/php/run
+++ b/root/etc/s6.d/php/run
@@ -1,3 +1,6 @@
 #!/bin/sh
-chown -R ${UID}:${GID} /phpapp /var/log/php7
+sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/php7/php-fpm.conf \
+       -e "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /etc/php7/php-fpm.conf \
+       -e "s/<DISPLAY_ERRORS>/$DISPLAY_ERRORS/g" /etc/php7/php-fpm.conf
+chown -R ${UID}:${GID} ${APPDIR} /var/log/php7
 su-exec ${UID}:${GID} php-fpm7