Merge pull request #47 from aakb/feature/docker-server

Alpine images

Author: cableman

php5.6-fpm/alpine/Dockerfile

@@ -10,24 +10,15 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \
     PHP_MEMORY_LIMIT="128M" \
     PHP_POST_MAX_SIZE="8M" \
     PHP_UPLOAD_MAX_FILESIZE="2M" \
+    PHP_TIMEZONE="Europe/Copenhagen" \
+    PHP_PM_TYPE="dynamic" \
     PHP_PM_MAX_CHILDREN="40" \
     PHP_PM_MAX_REQUESTS="0" \
     PHP_PM_START_SERVERS="5" \
     PHP_PM_MIN_SPARE_SERVERS="5" \
     PHP_PM_MAX_SPARE_SERVERS="8" \
     PHP_REQUEST_SLOWLOG_TIMEOUT="0" \
-    PHP_SLOWLOG="/var/log/php-slow.log" \
-    PHP_XDEBUG=0 \
-    PHP_XDEBUG_MAX_NESTING_LEVEL=265 \
-    PHP_XDEBUG_REMOTE_ADDR_HEADER="" \
-    PHP_XDEBUG_REMOTE_AUTOSTART=0 \
-    PHP_XDEBUG_REMOTE_CONNECT_BACK=1 \
-    PHP_XDEBUG_REMOTE_ENABLE=1 \
-    PHP_XDEBUG_REMOTE_HANDLER="dbgp" \
-    PHP_XDEBUG_REMOTE_HOST="localhost" \
-    PHP_XDEBUG_REMOTE_LOG="" \
-    PHP_XDEBUG_REMOTE_MODE="req" \
-    PHP_XDEBUG_REMOTE_PORT="9000"
+    PHP_SLOWLOG="/var/log/php-slow.log"
 
 RUN apk --update add --no-cache \
         libxslt-dev \
@@ -51,6 +42,7 @@ RUN apk --update add --no-cache \
         opcache \
         pdo_mysql \
         sysvsem \
+        soap \
         xsl \
         zip
 
@@ -68,7 +60,6 @@ RUN mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini
 
 # Copy custom PHP configuration.
 COPY etc/php/conf.d/opcache.ini /usr/local/etc/php/conf.d/20-opcache.ini
-COPY etc/php/conf.d/xdebug.ini /usr/local/etc/php/conf.d/30-xdebug.ini
 COPY etc/php/conf.d/php.ini /usr/local/etc/php/conf.d/20-php.ini
 
 # Custom FPM configuration.
@@ -78,7 +69,7 @@ EXPOSE 9000
 
 WORKDIR /app
 
-COPY  docker-entrypoint.sh /usr/local/bin/
+COPY docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
 CMD [ "docker-entrypoint.sh" ]

php5.6-fpm/alpine/docker-entrypoint.sh

@@ -1,13 +1,21 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 # Add docker host domain to hosts file
 if [ ! -z "${DOCKER_HOST_DOMAIN}" ]; then
   echo $(getent hosts host.docker.internal | cut -d" " -f1) ${DOCKER_HOST_DOMAIN} >> /etc/hosts
 fi
 
-# Set xdebug remote host to docker host ip.
-export PHP_XDEBUG_REMOTE_HOST=$(getent hosts host.docker.internal | cut -d" " -f1)
+## Set selected composer version. Default version 1.
+if [ ! -z "${COMPOSER_VERSION}" ]; then
+  if [ "${COMPOSER_VERSION}" = "1" ]; then
+    ln -fs /usr/local/bin/composer1 /usr/local/bin/composer
+  else
+    ln -fs /usr/local/bin/composer2 /usr/local/bin/composer
+  fi
+else
+  ln -fs /usr/local/bin/composer1 /usr/local/bin/composer
+fi
 
 ## Start the php FPM process.
 echo "Starting PHP 5.6 FPM"

php5.6-fpm/alpine/etc/php-fpm.d/fpm.ini

@@ -1,5 +1,5 @@
 [www]
-pm = dynamic
+pm = ${PHP_PM_TYPE}
 pm.max_children = ${PHP_PM_MAX_CHILDREN}
 pm.start_servers = ${PHP_PM_START_SERVERS}
 pm.min_spare_servers = ${PHP_PM_MIN_SPARE_SERVERS}

php5.6-fpm/alpine/etc/php/conf.d/php.ini

@@ -9,4 +9,4 @@ memory_limit = ${PHP_MEMORY_LIMIT}
 post_max_size = ${PHP_POST_MAX_SIZE}
 upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}
 
-date.timezone = UTC
+date.timezone = ${PHP_TIMEZONE}

php5.6-fpm/alpine/etc/php/conf.d/xdebug.ini

@@ -58,10 +58,17 @@ RUN sed -i '/memory_limit = 128M/c memory_limit = 256M' /etc/php/${PHP_VERSION}/
 && sed -i '/upload_max_filesize = 2M/c upload_max_filesize = 16M' /etc/php/${PHP_VERSION}/fpm/php.ini \
 && sed -i '/post_max_size = 8M/c post_max_size = 20M' /etc/php/${PHP_VERSION}/fpm/php.ini
 
-# Install composer
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-RUN php composer-setup.php --install-dir=/usr/local/bin --filename=composer
-RUN php -r "unlink('composer-setup.php');"
+# Install composer (both composer version as set symlink to right version in entry-point)
+ADD https://getcomposer.org/composer.phar /usr/local/bin/composer1
+ADD https://getcomposer.org/composer.phar /usr/local/bin/composer2
+RUN chmod 755 /usr/local/bin/composer1 \
+&& composer1 self-update --1 \
+&& composer1 self-update --stable \
+&& chmod 755 /usr/local/bin/composer2 \
+&& composer2 self-update --stable
+
+# Set default composer version (can be overriden in entry-point via COMPOSER_VERSION env)
+RUN ln -fs /usr/local/bin/composer1 /usr/local/bin/composer
 
 # Add mhsendmail for mailhog
 ADD https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 /usr/local/bin/mhsendmail

php5.6-fpm/xenial/Dockerfile

@@ -14,6 +14,17 @@ fi
 ## Run templates with configuration.
 /usr/local/bin/confd --onetime --backend env --confdir /etc/confd
 
+## Set selected composer version. Default version 1.
+if [ ! -z "${COMPOSER_VERSION}" ]; then
+  if [ "${COMPOSER_VERSION}" = "1" ]; then
+    ln -fs /usr/local/bin/composer1 /usr/local/bin/composer
+  else
+    ln -fs /usr/local/bin/composer2 /usr/local/bin/composer
+  fi
+else
+  ln -fs /usr/local/bin/composer1 /usr/local/bin/composer
+fi
+
 ## Start the php FPM process.
 echo "Starting PHP 5.6 FPM"
 php-fpm5.6 -F --pid /var/run/php/php-fpm5.6.pid -y /etc/php/5.6/fpm/php-fpm.conf

php5.6-fpm/xenial/docker-entrypoint.sh

@@ -0,0 +1,75 @@
+FROM php:7.0-fpm-alpine
+LABEL maintainer="ITK Dev <[email protected]>"
+
+ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \
+    PHP_OPCACHE_MAX_ACCELERATED_FILES="20000" \
+    PHP_OPCACHE_MEMORY_CONSUMPTION="64" \
+    PHP_OPCACHE_MAX_WASTED_PERCENTAGE="10" \
+    PHP_APCU_MEMORY_SIZE="16M" \
+    PHP_MAX_EXECUTION_TIME="30" \
+    PHP_MEMORY_LIMIT="128M" \
+    PHP_POST_MAX_SIZE="8M" \
+    PHP_UPLOAD_MAX_FILESIZE="2M" \
+    PHP_TIMEZONE="Europe/Copenhagen" \
+    PHP_PM_TYPE="dynamic" \
+    PHP_PM_MAX_CHILDREN="40" \
+    PHP_PM_MAX_REQUESTS="0" \
+    PHP_PM_START_SERVERS="5" \
+    PHP_PM_MIN_SPARE_SERVERS="5" \
+    PHP_PM_MAX_SPARE_SERVERS="8" \
+    PHP_REQUEST_SLOWLOG_TIMEOUT="0" \
+    PHP_SLOWLOG="/var/log/php-slow.log"
+
+RUN apk --update add --no-cache \
+        libxslt-dev \
+        libzip-dev \
+        libpng-dev \
+        gettext-dev \
+        git \
+        unzip \
+        icu-dev \
+        openldap-dev \
+        libmcrypt-dev \
+    && docker-php-ext-install -j$(nproc) \
+        bcmath \
+        gd \
+        gettext \
+        intl \
+        ldap \
+        pdo_mysql \
+        mysqli \
+        opcache \
+        pdo_mysql \
+        sysvsem \
+        soap \
+        xsl \
+        zip
+
+RUN apk --update add --no-cache --virtual .build-deps autoconf g++ make \
+    && pecl install redis-4.0.1 \
+    && docker-php-ext-enable redis \
+    && apk del .build-deps
+
+# Added cache tool.
+ADD https://gordalina.github.io/cachetool/downloads/cachetool.phar /usr/local/bin/cachetool
+RUN chmod +x /usr/local/bin/cachetool
+
+# Use default PHP production configuration.
+RUN mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini
+
+# Copy custom PHP configuration.
+COPY etc/php/conf.d/opcache.ini /usr/local/etc/php/conf.d/20-opcache.ini
+COPY etc/php/conf.d/php.ini /usr/local/etc/php/conf.d/20-php.ini
+
+# Custom FPM configuration.
+COPY etc/php-fpm.d/fpm.ini /usr/local/etc/php-fpm.d/zz-fpm-docker.conf
+
+EXPOSE 9000
+
+WORKDIR /app
+
+COPY docker-entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+
+CMD [ "docker-entrypoint.sh" ]
+

php7.0-fpm/alpine/Dockerfile

@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+# Add docker host domain to hosts file
+if [ ! -z "${DOCKER_HOST_DOMAIN}" ]; then
+  echo $(getent hosts host.docker.internal | cut -d" " -f1) ${DOCKER_HOST_DOMAIN} >> /etc/hosts
+fi
+
+## Set selected composer version. Default version 1.
+if [ ! -z "${COMPOSER_VERSION}" ]; then
+  if [ "${COMPOSER_VERSION}" = "1" ]; then
+    ln -fs /usr/local/bin/composer1 /usr/local/bin/composer
+  else
+    ln -fs /usr/local/bin/composer2 /usr/local/bin/composer
+  fi
+else
+  ln -fs /usr/local/bin/composer1 /usr/local/bin/composer
+fi
+
+## Start the php FPM process.
+echo "Starting PHP 7.0 FPM"
+/usr/local/bin/docker-php-entrypoint php-fpm

php7.0-fpm/alpine/docker-entrypoint.sh

@@ -0,0 +1,13 @@
+[www]
+pm = ${PHP_PM_TYPE}
+pm.max_children = ${PHP_PM_MAX_CHILDREN}
+pm.start_servers = ${PHP_PM_START_SERVERS}
+pm.min_spare_servers = ${PHP_PM_MIN_SPARE_SERVERS}
+pm.max_spare_servers = ${PHP_PM_MAX_SPARE_SERVERS}
+pm.max_requests = ${PHP_PM_MAX_REQUESTS}
+
+request_slowlog_timeout = ${PHP_REQUEST_SLOWLOG_TIMEOUT}
+slowlog = ${PHP_SLOWLOG}
+
+; Enable the FPM status page
+pm.status_path = /status