Install DMA & handle configuration variables (fixes #204)

Dockerfile.apache

@@ -1,6 +1,7 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
+ARG INSTALL_DMA=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache

Dockerfile.cli

@@ -1,6 +1,7 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
+ARG INSTALL_DMA=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli

Dockerfile.fpm

@@ -1,6 +1,7 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
+ARG INSTALL_DMA=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-fpm

Dockerfile.slim.apache

@@ -291,6 +291,7 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
 COPY utils/generate_cron.php /usr/local/bin/generate_cron.php
+COPY utils/generate_dma.php /usr/local/bin/generate_dma.php
 COPY utils/startup_commands.php /usr/local/bin/startup_commands.php
 
 COPY utils/enable_apache_mods.php /usr/local/bin/enable_apache_mods.php
@@ -385,3 +386,18 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
     sudo apt-get clean && \
     sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \
     fi;
+
+# |--------------------------------------------------------------------------
+# | DragonFly Mail Agent
+# |--------------------------------------------------------------------------
+# |
+# | Installs DragonFly Mail Agent, a sendmail-compatible MTA that can be used
+# | to send email from PHP, either using direct delivery or through an SMTP
+# | smarthost.
+# |
+
+ONBUILD ARG INSTALL_DMA
+ONBUILD RUN if [ -n "$INSTALL_DMA" ]; then \
+    sudo apt-get update && \
+    sudo -E apt-get install -y --no-install-recommends dma; \
+    fi;

Dockerfile.slim.cli

@@ -217,6 +217,7 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
 COPY utils/generate_cron.php /usr/local/bin/generate_cron.php
+COPY utils/generate_dma.php /usr/local/bin/generate_dma.php
 COPY utils/startup_commands.php /usr/local/bin/startup_commands.php
 
 COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
@@ -290,3 +291,18 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
     sudo apt-get clean && \
     sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \
     fi;
+
+# |--------------------------------------------------------------------------
+# | DragonFly Mail Agent
+# |--------------------------------------------------------------------------
+# |
+# | Installs DragonFly Mail Agent, a sendmail-compatible MTA that can be used
+# | to send email from PHP, either using direct delivery or through an SMTP
+# | smarthost.
+# |
+
+ONBUILD ARG INSTALL_DMA
+ONBUILD RUN if [ -n "$INSTALL_DMA" ]; then \
+    sudo apt-get update && \
+    sudo -E apt-get install -y --no-install-recommends dma; \
+    fi;

Dockerfile.slim.fpm

@@ -230,6 +230,7 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
 COPY utils/generate_cron.php /usr/local/bin/generate_cron.php
+COPY utils/generate_dma.php /usr/local/bin/generate_dma.php
 COPY utils/startup_commands.php /usr/local/bin/startup_commands.php
 
 COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
@@ -313,3 +314,18 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
     sudo apt-get clean && \
     sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \
     fi;
+
+# |--------------------------------------------------------------------------
+# | DragonFly Mail Agent
+# |--------------------------------------------------------------------------
+# |
+# | Installs DragonFly Mail Agent, a sendmail-compatible MTA that can be used
+# | to send email from PHP, either using direct delivery or through an SMTP
+# | smarthost.
+# |
+
+ONBUILD ARG INSTALL_DMA
+ONBUILD RUN if [ -n "$INSTALL_DMA" ]; then \
+    sudo apt-get update && \
+    sudo -E apt-get install -y --no-install-recommends dma; \
+    fi;

utils/Dockerfile.blueprint

@@ -2,6 +2,7 @@
 
 ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
+ARG INSTALL_DMA=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-{{ $variant }}

utils/Dockerfile.slim.blueprint

@@ -308,6 +308,7 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
 COPY utils/generate_cron.php /usr/local/bin/generate_cron.php
+COPY utils/generate_dma.php /usr/local/bin/generate_dma.php
 COPY utils/startup_commands.php /usr/local/bin/startup_commands.php
 {{if eq $variant "apache" }}
 COPY utils/enable_apache_mods.php /usr/local/bin/enable_apache_mods.php
@@ -416,3 +417,18 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
     sudo apt-get clean && \
     sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \
     fi;
+
+# |--------------------------------------------------------------------------
+# | DragonFly Mail Agent
+# |--------------------------------------------------------------------------
+# |
+# | Installs DragonFly Mail Agent, a sendmail-compatible MTA that can be used
+# | to send email from PHP, either using direct delivery or through an SMTP
+# | smarthost.
+# |
+
+ONBUILD ARG INSTALL_DMA
+ONBUILD RUN if [ -n "$INSTALL_DMA" ]; then \
+    sudo apt-get update && \
+    sudo -E apt-get install -y --no-install-recommends dma; \
+    fi;

utils/docker-entrypoint-as-root.sh

@@ -116,6 +116,26 @@ fi
 unset DOCKER_FOR_MAC_REMOTE_HOST
 unset REMOTE_HOST_FOUND
 
+if [ -e /usr/sbin/dma ]; then
+    # set sendmail path for PHP
+    if [ "$DMA_FROM" = "" ]; then
+        DMA_FROM=noreply@example.org
+    fi
+    export PHP_INI_SENDMAIL_PATH="/usr/sbin/sendmail -t -i -f'$DMA_FROM'"
+
+    # generate DMA config based on DMA_CONF_... environment variables
+    php /usr/local/bin/generate_dma.php > /etc/dma/dma.conf
+
+	# generate DMA authentication file based on DMA_AUTH_... environment variables
+    if [ -n "$DMA_AUTH_USERNAME" ] && [ -n "$DMA_AUTH_PASSWORD" ]; then
+        if [ -z "$DMA_CONF_SMARTHOST" ]; then
+            echo "DMA_AUTH_USERNAME and DMA_AUTH_PASSWORD are set, but DMA_CONF_SMARTHOST is empty - not attempting authentication" >&2
+        else
+            echo "$DMA_AUTH_USERNAME|$DMA_CONF_SMARTHOST:$DMA_AUTH_PASSWORD" > /etc/dma/auth.conf
+        fi
+    fi
+fi
+
 sudo chown docker:docker /opt/php_env_var_cache.php
 /usr/bin/real_php /usr/local/bin/check_php_env_var_changes.php &> /dev/null
 

utils/generate_dma.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * A very simple script in charge of generating the DMA configuration based on environment variables.
+ * The script is run on each start of the container.
+ */
+
+require __DIR__.'/utils.php';
+
+$found = false;
+
+foreach ($_SERVER as $key => $value) {
+    if (strpos($key, 'DMA_') === 0) {
+        $found = true;
+    }
+    if (strpos($key, 'DMA_CONF_') === 0) {
+        $suffix = substr($key, 9);
+
+        echo $suffix." ".$value."\n";
+    }
+}
+
+if (($found === true) && !file_exists('/usr/sbin/dma')) {
+    // Let's check DMA is installed (it could be not installed is we are using the slim version...)
+    error_log('DMA is not available in this image. If you are using the thecodingmachine/php "slim" variant, do not forget to add "ARG INSTALL_DMA=1" in your Dockerfile. Check the documentation for more details.');
+    exit(1);
+}