From 21babc7bca7bab9fd452d97a60483e9b463ab95a Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Sat, 24 Oct 2020 20:13:56 +0200
Subject: [PATCH] Various un-breaking

---
 .envrc.sample                | 2 +-
 compose.mailrelay.yml        | 6 ------
 entrypoint.mailrelay.sh.tmpl | 2 --
 entrypoint.sh.tmpl           | 8 +++++++-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.envrc.sample b/.envrc.sample
index 8a96126..16d78a8 100644
--- a/.envrc.sample
+++ b/.envrc.sample
@@ -12,7 +12,7 @@ export LETS_ENCRYPT_ENV=production
 export DB_ROOT_PASSWORD_VERSION=v1
 export DB_PASSWORD_VERSION=v1
 export PHP_UPLOADS_CONF_VERSION=v1
-export ENTRYPOINT_CONF_VERSION=v1
+export ENTRYPOINT_MAILRELAY_CONF_VERSION=v1
 
 # Multisite
 #export WORDPRESS_CONFIG_EXTRA="\
diff --git a/compose.mailrelay.yml b/compose.mailrelay.yml
index c9f3065..ad686d8 100644
--- a/compose.mailrelay.yml
+++ b/compose.mailrelay.yml
@@ -7,8 +7,6 @@ services:
     environment:
       - SMTP_HOST=${SMTP_HOST}
       - MAIL_FROM=${MAIL_FROM}
-    networks:
-      - mail
     configs:
       - source: mstmp_conf
         target: /etc/msmtprc
@@ -16,10 +14,6 @@ services:
         target: /docker-entrypoint.mailrelay.sh
         mode: 0555
 
-networks:
-  mail:
-    external: true
-
 configs:
   mstmp_conf:
     name: ${STACK_NAME}_mstmp_conf_${MSMTP_CONF_VERSION}
diff --git a/entrypoint.mailrelay.sh.tmpl b/entrypoint.mailrelay.sh.tmpl
index e36ed5b..c568880 100644
--- a/entrypoint.mailrelay.sh.tmpl
+++ b/entrypoint.mailrelay.sh.tmpl
@@ -3,5 +3,3 @@
 apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y msmtp && rm -rf /var/lib/apt/lists/*
 
 echo "sendmail_path = /usr/bin/msmtp -t -i" > /usr/local/etc/php/conf.d/sendmail.ini
-
-/docker-entrypoint.sh "$@"
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index b3068e4..01800ba 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -1,7 +1,13 @@
 #!/bin/bash
 
+{{ if (env "PHP_EXTENSIONS") }}
 docker-php-ext-install {{ env "PHP_EXTENSIONS" }}
+{{ end }}
+
+if [ -n "$@" ]; then
+	"$@"
+fi
 
 # Upstream ENTRYPOINT
 # https://github.com/docker-library/wordpress/blob/master/php7.4/apache/Dockerfile#L120
-/usr/local/bin/docker-entrypoint.sh apache2-foreground "$@"
+/usr/local/bin/docker-entrypoint.sh apache2-foreground