Merge pull request #32 from Tuurlijk/master

Add mhsendmail for optional mailhandling by MailHog

Dockerfiles/mods/Dockerfile-7.0

@@ -215,7 +215,7 @@ RUN set -x \
 	&& /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \
-	&& pecl install swoole \
+	&& pecl install swoole-2.2.0 \
 	&& docker-php-ext-enable swoole \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \

Dockerfiles/work/Dockerfile-5.3

@@ -146,6 +146,11 @@ RUN set -x \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew update' \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
  \
+# mhsendmail
+	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+&& chmod +x mhsendmail_linux_amd64 \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+ \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
 && cd /usr/local/src/mysqldump-secure \

Dockerfiles/work/Dockerfile-5.4

@@ -156,6 +156,11 @@ RUN set -x \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew update' \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
  \
+# mhsendmail
+	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+&& chmod +x mhsendmail_linux_amd64 \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+ \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
 && cd /usr/local/src/mysqldump-secure \

Dockerfiles/work/Dockerfile-5.5

@@ -159,6 +159,11 @@ RUN set -x \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew update' \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
  \
+# mhsendmail
+	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+&& chmod +x mhsendmail_linux_amd64 \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+ \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
 && cd /usr/local/src/mysqldump-secure \

Dockerfiles/work/Dockerfile-5.6

@@ -159,6 +159,11 @@ RUN set -x \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew update' \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
  \
+# mhsendmail
+	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+&& chmod +x mhsendmail_linux_amd64 \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+ \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
 && cd /usr/local/src/mysqldump-secure \

Dockerfiles/work/Dockerfile-7.0

@@ -159,6 +159,11 @@ RUN set -x \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew update' \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
  \
+# mhsendmail
+	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+&& chmod +x mhsendmail_linux_amd64 \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+ \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
 && cd /usr/local/src/mysqldump-secure \

Dockerfiles/work/Dockerfile-7.1

@@ -159,6 +159,11 @@ RUN set -x \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew update' \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
  \
+# mhsendmail
+	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+&& chmod +x mhsendmail_linux_amd64 \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+ \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
 && cd /usr/local/src/mysqldump-secure \

Dockerfiles/work/Dockerfile-7.2

@@ -159,6 +159,11 @@ RUN set -x \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew update' \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
  \
+# mhsendmail
+	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+&& chmod +x mhsendmail_linux_amd64 \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+ \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
 && cd /usr/local/src/mysqldump-secure \

Dockerfiles/work/Dockerfile-7.3

@@ -159,6 +159,11 @@ RUN set -x \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew update' \
 && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
  \
+# mhsendmail
+	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+&& chmod +x mhsendmail_linux_amd64 \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+ \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
 && cd /usr/local/src/mysqldump-secure \

build/ansible/group_vars/all.yml

@@ -61,6 +61,7 @@ software_enabled:
   - grunt
   - laravel
   - linuxbrew
+  - mhsendmail
   - mysqldumpsecure
   - phalcon
   - phpcs
@@ -266,6 +267,12 @@ software_available:
         	'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \
         && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew update' \
         && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
+  mhsendmail:
+    all:
+      command: |
+        wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+        && chmod +x mhsendmail_linux_amd64 \
+        && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
   mysqldumpsecure:
     check: mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+'
     all:
@@ -966,8 +973,9 @@ extensions_available:
     5.6:
       type: pecl
       version: 1.9.23
-    7.2:
+    7.0:
       type: pecl
+      version: 2.2.0
     7.3:
       type: git
       git_url: https://github.com/swoole/swoole-src