add php 7.4 and internalize mhsendmail

due to unknown issues when downloading mhsendmail added it to the repo
and use a update script to get potentially new versions.

Signed-off-by: BlackEagle <[email protected]>

Author: BlackIkeEagle

.gitignore

@@ -0,0 +1 @@
+/mhsendmail

.gitlab-ci.yml

@@ -60,6 +60,15 @@ build:7.3:
   only:
     - master
 
+build:7.4:
+  stage: build
+  tags:
+    - dockerwest
+  script:
+    - cd 7.4; ./build.sh
+  only:
+    - master
+
 release:5.6:
   stage: release
   tags:
@@ -105,6 +114,15 @@ release:7.3:
   only:
     - master
 
+release:7.4:
+  stage: release
+  tags:
+    - dockerwest
+  script:
+    - docker push dockerwest/php:7.4
+  only:
+    - master
+
 trigger:php-laravel:
   stage: trigger
   trigger:
@@ -129,3 +147,8 @@ trigger:php-symfony:
   stage: trigger
   trigger:
     project: DockerWest/php-symfony
+
+trigger:php-sylius:
+  stage: trigger
+  trigger:
+    project: DockerWest/php-sylius

5.6/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:stable-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DW_PHP_VERSION=5.6

5.6/build.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
-#docker pull debian:stretch-slim
+#docker pull debian:stable-slim
 
 docker build --no-cache -t dockerwest/php:5.6 .

5.6/scripts/install-development.sh

@@ -18,10 +18,6 @@ curl -LsS https://getcomposer.org/installer | \
     [[ -e Tideways.php ]] || false && true
 )
 
-curl -LsSO "https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64"
-mv mhsendmail_linux_amd64 /usr/local/lib/mhsendmail
-chmod +x /usr/local/lib/mhsendmail
-
 printf "xdebug.remote_enable = 1\nxdebug.remote_connect_back = 1\nxdebug.max_nesting_level=400\n" \
     >> /etc/php/${DW_PHP_VERSION}/mods-available/xdebug.ini
 

5.6/scripts/usr/local/lib/mhsendmail

@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:stable-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DW_PHP_VERSION=7.0

7.0/Dockerfile

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
-#docker pull debian:stretch-slim
+#docker pull debian:stable-slim
 
 docker build --no-cache -t dockerwest/php:7.0 .

7.0/build.sh

@@ -18,10 +18,6 @@ curl -LsS https://getcomposer.org/installer | \
     [[ -e Tideways.php ]] || false && true
 )
 
-curl -LsSO "https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64"
-mv mhsendmail_linux_amd64 /usr/local/lib/mhsendmail
-chmod +x /usr/local/lib/mhsendmail
-
 printf "xdebug.remote_enable = 1\nxdebug.remote_connect_back = 1\nxdebug.max_nesting_level=400\n" \
     >> /etc/php/${DW_PHP_VERSION}/mods-available/xdebug.ini
 

7.0/scripts/install-development.sh

@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:stable-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DW_PHP_VERSION=7.1

7.0/scripts/usr/local/lib/mhsendmail

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
-#docker pull debian:stretch-slim
+#docker pull debian:stable-slim
 
 docker build --no-cache -t dockerwest/php:7.1 .

7.1/Dockerfile

@@ -18,10 +18,6 @@ curl -LsS https://getcomposer.org/installer | \
     [[ -e Tideways.php ]] || false && true
 )
 
-curl -LsSO "https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64"
-mv mhsendmail_linux_amd64 /usr/local/lib/mhsendmail
-chmod +x /usr/local/lib/mhsendmail
-
 printf "xdebug.remote_enable = 1\nxdebug.remote_connect_back = 1\nxdebug.max_nesting_level=400\n" \
     >> /etc/php/${DW_PHP_VERSION}/mods-available/xdebug.ini
 

7.1/build.sh

@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:stable-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DW_PHP_VERSION=7.2

7.1/scripts/install-development.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
-#docker pull debian:stretch-slim
+#docker pull debian:stable-slim
 
 docker build --no-cache -t dockerwest/php:7.2 .

7.1/scripts/usr/local/lib/mhsendmail

@@ -18,10 +18,6 @@ curl -LsS https://getcomposer.org/installer | \
     [[ -e Tideways.php ]] || false && true
 )
 
-curl -LsSO "https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64"
-mv mhsendmail_linux_amd64 /usr/local/lib/mhsendmail
-chmod +x /usr/local/lib/mhsendmail
-
 printf "xdebug.remote_enable = 1\nxdebug.remote_connect_back = 1\nxdebug.max_nesting_level=400\n" \
     >> /etc/php/${DW_PHP_VERSION}/mods-available/xdebug.ini
 

7.2/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:stable-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DW_PHP_VERSION=7.3

7.2/build.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
-#docker pull debian:stretch-slim
+#docker pull debian:stable-slim
 
 docker build --no-cache -t dockerwest/php:7.3 .

7.2/scripts/install-development.sh

@@ -18,10 +18,6 @@ curl -LsS https://getcomposer.org/installer | \
     [[ -e Tideways.php ]] || false && true
 )
 
-curl -LsSO "https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64"
-mv mhsendmail_linux_amd64 /usr/local/lib/mhsendmail
-chmod +x /usr/local/lib/mhsendmail
-
 printf "xdebug.remote_enable = 1\nxdebug.remote_connect_back = 1\nxdebug.max_nesting_level=400\n" \
     >> /etc/php/${DW_PHP_VERSION}/mods-available/xdebug.ini
 

7.2/scripts/usr/local/lib/mhsendmail

@@ -0,0 +1,16 @@
+FROM debian:stable-slim
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DW_PHP_VERSION=7.4
+
+COPY ./scripts /
+RUN /install.sh && rm /install*
+
+EXPOSE 9000
+VOLUME ["/xhprof", "/xdebug"]
+WORKDIR /phpapp
+
+ENTRYPOINT ["/command.sh"]
+CMD ["php-fpm7.4"]
+
+HEALTHCHECK --interval=10s --timeout=3s CMD /health.sh

7.3/Dockerfile

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+#docker pull debian:stable-slim
+
+docker build --no-cache -t dockerwest/php:7.4 .

7.3/build.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [[ "php-fpm${DW_PHP_VERSION}" == "$1" ]]; then
+    touch /run/php/.checkfpm
+fi
+
+/prepare.sh
+
+[[ -f /prepare-command.sh ]] && bash /prepare-command.sh
+
+if [[ 0 = "$UID" ]] && [[ "php-fpm${DW_PHP_VERSION}" != "$1" ]] && [[ "/bin/bash" != "$1" ]]; then
+    exec gosu www-data "$@"
+else
+    exec "$@"
+fi

7.3/scripts/install-development.sh

@@ -0,0 +1,3 @@
+; priority=80
+memory_limit = 256M
+display_errors = Off

7.3/scripts/usr/local/lib/mhsendmail

@@ -0,0 +1,7 @@
+; priority=90
+date.timezone = "Europe/Brussels"
+display_errors = On
+error_reporting = -1
+max_execution_time = 120
+
+sendmail_path = "/usr/local/lib/mhsendmail --smtp-addr=mailcatcher:1025"

7.4/Dockerfile

@@ -0,0 +1,7 @@
+; priority=80
+opcache.enable_cli=1
+opcache.memory_consumption=128
+opcache.max_accelerated_files=10000
+opcache.validate_timestamps=0
+opcache.consistency_checks=0
+opcache.save_comments=1

7.4/build.sh

@@ -0,0 +1,4 @@
+; priority=80
+xdebug.profiler_enable=1
+xdebug.profiler_output_dir=/xdebug
+xdebug.profiler_output_name=cachegrind.out.%u

7.4/scripts/command.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ -e /run/php/.checkfpm ]]; then
+    php -n /usr/local/bin/php-health.phar
+    exit $?
+else
+    exit 0
+fi

7.4/scripts/etc/php/7.4/mods-available/custom.ini

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -e
+
+curl -LsS https://packages.blackfire.io/gpg.key | apt-key add -
+echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list
+
+apt-get update
+apt-get install -y php-xdebug php-tideways git blackfire-php
+apt-get clean -y
+curl -LsS https://getcomposer.org/installer | \
+    php -- --install-dir=/usr/local/lib --filename=composer
+[[ -e /usr/local/lib/composer ]] || false && true
+
+(
+    cd /usr/lib/php/$(php -i | grep ^extension_dir | sed -e 's/.*\/\([0-9]*\).*/\1/')
+    curl -O https://raw.githubusercontent.com/tideways/profiler/master/Tideways.php
+    [[ -e Tideways.php ]] || false && true
+)
+
+printf "xdebug.remote_enable = 1\nxdebug.remote_connect_back = 1\nxdebug.max_nesting_level=400\n" \
+    >> /etc/php/${DW_PHP_VERSION}/mods-available/xdebug.ini
+
+if [[ -e /etc/php/${DW_PHP_VERSION}/mods-available/tideways.ini ]]; then
+    cp -a /etc/php/${DW_PHP_VERSION}/mods-available/tideways.ini \
+        /etc/php/${DW_PHP_VERSION}/mods-available/xhprof.ini
+
+    printf "auto_prepend_file=/usr/share/xhprof/prepend.php\n" \
+        >> /etc/php/${DW_PHP_VERSION}/mods-available/xhprof.ini
+
+    printf "tideways.udp_connection=\"tideways:8135\"\ntideways.connection=\"tcp://tideways:9135\"\ntideways.monitor_cli=1\n" \
+        >> /etc/php/${DW_PHP_VERSION}/mods-available/tideways.ini
+    printf "auto_prepend_file=/usr/share/tideways/prepend.php\n" \
+        >> /etc/php/${DW_PHP_VERSION}/mods-available/tideways.ini
+fi
+
+if [[ -e /etc/php/${DW_PHP_VERSION}/mods-available/blackfire.ini ]]; then
+    sed -e 's#\(blackfire.agent_socket\).*#\1=tcp://blackfire:8707#' \
+        -i /etc/php/${DW_PHP_VERSION}/mods-available/blackfire.ini
+fi
+
+phpdismod xdebug
+phpdismod tideways
+phpdismod blackfire

7.4/scripts/etc/php/7.4/mods-available/development.ini

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -e
+
+# ondrej debian
+apt-get update
+apt-get install -y apt-transport-https lsb-release ca-certificates curl \
+    liblz4-tool gnupg unzip
+curl -o /etc/apt/trusted.gpg.d/php.gpg \
+    https://packages.sury.org/php/apt.gpg
+echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" \
+    > /etc/apt/sources.list.d/php.list
+
+# install packages
+apt-get update
+apt-get upgrade -y
+apt-get install -y php${DW_PHP_VERSION}-cli \
+    php${DW_PHP_VERSION}-fpm \
+    php${DW_PHP_VERSION}-curl \
+    php${DW_PHP_VERSION}-json \
+    php${DW_PHP_VERSION}-zip
+update-alternatives --set php /usr/bin/php${DW_PHP_VERSION}
+apt-get clean -y
+
+mkdir -p /phpapp
+
+# enable custom php configuration
+phpenmod custom
+
+# enable custom opcache config
+phpenmod opcache_settings
+
+# configure php for docker
+sed -e 's#^\(error_log\).*#\1 = /dev/stderr#' \
+    -e 's#^;\(daemonize\).*#\1 = no#' \
+    -i /etc/php/${DW_PHP_VERSION}/fpm/php-fpm.conf
+sed -e 's#^;\(access.log\).*#\1 = /dev/stderr#' \
+    -e 's#^\(listen\).*#\1 = 0.0.0.0:9000#' \
+    -e 's#^;\(catch_workers_output\).*#\1 = yes#' \
+    -e 's#^;\(clear_env\).*#\1 = no#' \
+    -e 's#^;\(ping\)#\1#g' \
+    -i /etc/php/${DW_PHP_VERSION}/fpm/pool.d/www.conf
+
+# install developer stuff
+./install-development.sh
+
+# gosu
+GOSU_VERSION='1.10'
+dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"
+curl -L -o /usr/local/bin/gosu \
+    "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"
+chmod +x /usr/local/bin/gosu
+
+# phphealth
+PHP_HEALTH_VERSION='0.0.1'
+curl -L -o /usr/local/bin/php-health.phar \
+    "https://github.com/dockerwest/php-health/releases/download/$PHP_HEALTH_VERSION/php-health.phar"
+chmod +x /usr/local/bin/php-health.phar
+
+# update permissions to allow rootless operation
+/usr/local/bin/permissions

7.4/scripts/etc/php/7.4/mods-available/opcache_settings.ini

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+if [[ 0 = "$UID" ]]; then
+    if [[ ! -z $C_GID ]]; then
+        groupmod -g $C_GID www-data
+    fi
+
+    if [[ ! -z $C_UID ]]; then
+        usermod -u $C_UID www-data
+    fi
+
+    chown www-data:www-data /run/php
+
+    chown www-data:www-data /var/www
+
+    chown www-data:www-data /phpapp
+fi
+
+if [[ "1" == "$DEVELOPMENT" ]]; then
+    if [[ 0 = "$UID" ]] && [[ ! -z $PHP_EXTRA_MODULES ]]; then
+        /usr/local/bin/extensions -i $PHP_EXTRA_MODULES
+    fi
+
+    sed -e 's/^\(opcache\.validate_timestamps=\).*/\11/g' \
+        -i /etc/php/${DW_PHP_VERSION}/mods-available/opcache_settings.ini
+
+    phpenmod development > /dev/null 2>&1
+    phpenmod xdebug > /dev/null 2>&1
+
+    ln -s /usr/local/lib/composer /usr/local/bin/composer
+fi
+
+if [[ "xdebug" == "$PROFILER" ]]; then
+    [[ 0 = "$UID" ]] && chown www-data:www-data /xdebug
+    phpenmod xdebug > /dev/null 2>&1
+    phpenmod xdebug_profiler > /dev/null 2>&1
+elif [[ "xhprof" == "$PROFILER" ]]; then
+    [[ 0 = "$UID" ]] && chown www-data:www-data /xhprof
+    phpenmod xhprof > /dev/null 2>&1
+elif [[ "tideways" == "$PROFILER" ]]; then
+    phpenmod tideways > /dev/null 2>&1
+elif [[ "blackfire" == "$PROFILER" ]]; then
+    phpenmod blackfire > /dev/null 2>&1
+fi