From 43cbfafb8a7965cdb96bd6401984138d40f0c715 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Fri, 23 Oct 2020 04:06:26 +0200
Subject: [PATCH] Enable additional PHP extensions

---
 .envrc.sample                |  5 +++++
 compose.mailrelay.yml        |  8 ++++----
 compose.yml                  | 17 +++++++++++++++++
 entrypoint.mailrelay.sh.tmpl |  4 +---
 entrypoint.sh.tmpl           |  7 +++++++
 uploads.ini                  |  3 +++
 6 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 entrypoint.sh.tmpl
 create mode 100644 uploads.ini

diff --git a/.envrc.sample b/.envrc.sample
index 93579ce..8a96126 100644
--- a/.envrc.sample
+++ b/.envrc.sample
@@ -6,8 +6,13 @@ export DOMAIN=wordpress.example.com
 #export EXTRA_DOMAINS=', `www.wordpress.example.com`'
 export LETS_ENCRYPT_ENV=production
 
+## Additional extensions
+#export PHP_EXTENSIONS="calendar"
+
 export DB_ROOT_PASSWORD_VERSION=v1
 export DB_PASSWORD_VERSION=v1
+export PHP_UPLOADS_CONF_VERSION=v1
+export ENTRYPOINT_CONF_VERSION=v1
 
 # Multisite
 #export WORDPRESS_CONFIG_EXTRA="\
diff --git a/compose.mailrelay.yml b/compose.mailrelay.yml
index 92760ad..c9f3065 100644
--- a/compose.mailrelay.yml
+++ b/compose.mailrelay.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    entrypoint: /docker-entrypoint.sh
+    entrypoint: /docker-entrypoint.mailrelay.sh
     environment:
       - SMTP_HOST=${SMTP_HOST}
       - MAIL_FROM=${MAIL_FROM}
@@ -12,8 +12,8 @@ services:
     configs:
       - source: mstmp_conf
         target: /etc/msmtprc
-      - source: entrypoint_conf
-        target: /docker-entrypoint.sh
+      - source: entrypoint_mailrelay_conf
+        target: /docker-entrypoint.mailrelay.sh
         mode: 0555
 
 networks:
@@ -25,7 +25,7 @@ configs:
     name: ${STACK_NAME}_mstmp_conf_${MSMTP_CONF_VERSION}
     file: msmtp.conf.tmpl
     template_driver: golang
-  entrypoint_conf:
+  entrypoint_mailrelay_conf:
     name: ${STACK_NAME}_entrypoint_mailrelay_${ENTRYPOINT_MAILRELAY_CONF_VERSION}
     file: entrypoint.mailrelay.sh.tmpl
     template_driver: golang
diff --git a/compose.yml b/compose.yml
index 413ef1e..d6a8b2b 100644
--- a/compose.yml
+++ b/compose.yml
@@ -15,8 +15,16 @@ services:
       - WORDPRESS_DB_PASSWORD_FILE=/run/secrets/db_password
       - WORDPRESS_DB_NAME=wordpress
       - WORDPRESS_CONFIG_EXTRA=${WORDPRESS_CONFIG_EXTRA}
+      - PHP_EXTENSIONS
     secrets:
       - db_password
+    configs:
+      - source: php_uploads_conf
+        target: /usr/local/etc/php/conf.d/uploads.ini
+      - source: entrypoint_conf
+        target: /docker-entrypoint.sh
+        mode: 0555
+    entrypoint: /docker-entrypoint.sh
     depends_on:
       - db
     healthcheck:
@@ -73,3 +81,12 @@ secrets:
   db_password:
     external: true
     name: ${STACK_NAME}_db_password_${DB_PASSWORD_VERSION}
+
+configs:
+  entrypoint_conf:
+    name: ${STACK_NAME}_entrypoint_conf_${ENTRYPOINT_CONF_VERSION}
+    file: entrypoint.sh.tmpl
+    template_driver: golang
+  php_uploads_conf:
+    name: ${STACK_NAME}_php_uploads_conf_${PHP_UPLOADS_CONF_VERSION}
+    file: uploads.ini
diff --git a/entrypoint.mailrelay.sh.tmpl b/entrypoint.mailrelay.sh.tmpl
index c681ce9..e36ed5b 100644
--- a/entrypoint.mailrelay.sh.tmpl
+++ b/entrypoint.mailrelay.sh.tmpl
@@ -4,6 +4,4 @@ apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y msmtp && rm
 
 echo "sendmail_path = /usr/bin/msmtp -t -i" > /usr/local/etc/php/conf.d/sendmail.ini
 
-# Upstream ENTRYPOINT
-# https://github.com/docker-library/wordpress/blob/master/php7.4/apache/Dockerfile#L120
-/usr/local/bin/docker-entrypoint.sh apache2-foreground "$@"
+/docker-entrypoint.sh "$@"
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
new file mode 100644
index 0000000..b3068e4
--- /dev/null
+++ b/entrypoint.sh.tmpl
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+docker-php-ext-install {{ env "PHP_EXTENSIONS" }}
+
+# Upstream ENTRYPOINT
+# https://github.com/docker-library/wordpress/blob/master/php7.4/apache/Dockerfile#L120
+/usr/local/bin/docker-entrypoint.sh apache2-foreground "$@"
diff --git a/uploads.ini b/uploads.ini
new file mode 100644
index 0000000..a60fde7
--- /dev/null
+++ b/uploads.ini
@@ -0,0 +1,3 @@
+file_uploads = On
+upload_max_filesize = 256M
+post_max_size = 256M