docker fixes

app/Route/routes.json

@@ -1,15 +0,0 @@
-{
-  "middlewares": [
-    {
-      "middleware": "Luticate\\Auth\\Business\\LuticateMiddleware",
-      "parameters": {}
-    }
-  ],
-  "routes": [
-    {
-      "method": "GET", "url": "/test",
-      "controller": "Test", "action": "test",
-      "middlewares": [], "permissions": []
-    }
-  ]
-}

docker/Dockerfile

@@ -1,80 +1,49 @@
-#ADD https://www.dotdeb.org/dotdeb.gpg /tmp/dotdeb.gpg
-#RUN apt-key add /tmp/dotdeb.gpg
-#COPY php7.list /etc/apt/sources.list.d
-#
-#RUN apt-get update &&\
-#        apt-get -y install\
-#        apache2=2.4.*\
-#        php-pear\
-#        libapache2-mod-php7.0\
-#        php7.0\
-#        php7.0-gd\
-#        php7.0-curl\
-#        php7.0-pgsql\
-#        php7.0-mcrypt\
-#        php7.0-json &&\
-#        apt-get clean
-#
-#COPY apache2.conf /etc/apache2/apache2.conf
-#COPY run.sh /run.sh
-#
-#RUN /usr/sbin/a2enmod rewrite &&\
-#        ln -sf /dev/stdout /var/log/apache2/access.log &&\
-#        ln -sf /dev/stderr /var/log/apache2/error.log &&\
-#        rm -rf /var/www/ &&\
-#        mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www &&\
-#        chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www &&\
-#        chmod +x /run.sh
-#
-#EXPOSE 80
-#
-#VOLUME ["/var/www"]
-#
-#CMD ["/run.sh"]
-
-
-
 FROM debian:jessie
 
 MAINTAINER Robin Thoni <robin@rthoni.com>
 
-# persistent / runtime deps
+# Build php
+# ======================================================================================================================
 ENV PHPIZE_DEPS \
-		autoconf \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkg-config \
-		re2c
-RUN apt-get update && apt-get install -y \
-		$PHPIZE_DEPS \
-		ca-certificates \
-		curl \
-		libedit2 \
-		libsqlite3-0 \
-		libxml2 \
-	--no-install-recommends && rm -r /var/lib/apt/lists/*
-
-ENV PHP_INI_DIR /usr/local/etc/php
+            autoconf \
+            file \
+            g++ \
+            gcc \
+            libc-dev \
+            make \
+            pkg-config \
+            re2c
+RUN apt-get update \
+        && apt-get install -y \
+		    $PHPIZE_DEPS \
+		    ca-certificates \
+		    curl \
+		    libedit2 \
+		    libsqlite3-0 \
+		    libxml2 \
+	        --no-install-recommends \
+	    && rm -r /var/lib/apt/lists/*
+
+ENV PHP_INI_DIR /etc/php7.0
 RUN mkdir -p $PHP_INI_DIR/conf.d
 
-##<autogenerated>##
-RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update \
+        && apt-get install -y apache2-bin apache2.2-common --no-install-recommends \
+        && rm -rf /var/lib/apt/lists/*
 
-RUN rm -rf /var/www/html && mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html && chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html
+RUN rm -rf /var/www/html \
+        && mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html \
+        && chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html
 
-# Apache + PHP requires preforking Apache for best results
-RUN a2dismod mpm_event && a2enmod mpm_prefork
+RUN a2dismod mpm_event \
+        && a2enmod mpm_prefork
 
-RUN mv /etc/apache2/apache2.conf /etc/apache2/apache2.conf.dist && rm /etc/apache2/conf-enabled/* /etc/apache2/sites-enabled/*
+RUN mv /etc/apache2/apache2.conf /etc/apache2/apache2.conf.dist \
+        && rm /etc/apache2/conf-enabled/* /etc/apache2/sites-enabled/*
 COPY apache2.conf /etc/apache2/apache2.conf
-# it'd be nice if we could not COPY apache2.conf until the end of the Dockerfile, but its contents are checked by PHP during compilation
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
 ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --enable-maintainer-zts --enable-pthreads
-##</autogenerated>##
 
 ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763
 
@@ -83,65 +52,86 @@ ENV PHP_FILENAME php-7.0.7.tar.xz
 ENV PHP_SHA256 9cc64a7459242c79c10e79d74feaf5bae3541f604966ceb600c3d2e8f5fe4794
 
 RUN set -xe \
-	&& buildDeps=" \
-		$PHP_EXTRA_BUILD_DEPS \
-		libcurl4-openssl-dev \
-		libedit-dev \
-		libsqlite3-dev \
-		libssl-dev \
-		libxml2-dev \
-		xz-utils \
-	" \
-	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
-	&& curl -fSL "http://php.net/get/$PHP_FILENAME/from/this/mirror" -o "$PHP_FILENAME" \
-	&& echo "$PHP_SHA256 *$PHP_FILENAME" | sha256sum -c - \
-	&& curl -fSL "http://php.net/get/$PHP_FILENAME.asc/from/this/mirror" -o "$PHP_FILENAME.asc" \
-	&& export GNUPGHOME="$(mktemp -d)" \
-	&& for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-	done \
-	&& gpg --batch --verify "$PHP_FILENAME.asc" "$PHP_FILENAME" \
-	&& rm -r "$GNUPGHOME" "$PHP_FILENAME.asc" \
-	&& mkdir -p /usr/src/php \
-	&& tar -xf "$PHP_FILENAME" -C /usr/src/php --strip-components=1 \
-	&& rm "$PHP_FILENAME" \
-	&& cd /usr/src/php \
-	&& ./configure \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		$PHP_EXTRA_CONFIGURE_ARGS \
-		--disable-cgi \
-# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
-		--enable-mysqlnd \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-	&& make -j"$(nproc)" \
-	&& make install \
-	&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
-	&& make clean \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false $buildDeps
+        && buildDeps=" \
+            $PHP_EXTRA_BUILD_DEPS \
+            libcurl4-openssl-dev \
+            libedit-dev \
+            libsqlite3-dev \
+            libssl-dev \
+            libxml2-dev \
+            xz-utils \
+        " \
+        && apt-get update \
+        && apt-get install -y $buildDeps --no-install-recommends \
+        && rm -rf /var/lib/apt/lists/* \
+        && curl -fSL "http://php.net/get/$PHP_FILENAME/from/this/mirror" -o "$PHP_FILENAME" \
+        && echo "$PHP_SHA256 *$PHP_FILENAME" | sha256sum -c - \
+        && curl -fSL "http://php.net/get/$PHP_FILENAME.asc/from/this/mirror" -o "$PHP_FILENAME.asc" \
+        && export GNUPGHOME="$(mktemp -d)" \
+        && for key in $GPG_KEYS; do \
+            gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+            done \
+        && gpg --batch --verify "$PHP_FILENAME.asc" "$PHP_FILENAME" \
+        && rm -r "$GNUPGHOME" "$PHP_FILENAME.asc" \
+        && mkdir -p /usr/src/php \
+        && tar -xf "$PHP_FILENAME" -C /usr/src/php --strip-components=1 \
+        && rm "$PHP_FILENAME" \
+        && cd /usr/src/php \
+        && ./configure \
+            --with-config-file-path="$PHP_INI_DIR" \
+            --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
+            $PHP_EXTRA_CONFIGURE_ARGS \
+            --disable-cgi \
+            --enable-mysqlnd \
+            --enable-mbstring \
+            --with-curl \
+            --with-libedit \
+            --with-openssl \
+            --with-zlib \
+        && make -j"$(nproc)" \
+        && make install \
+        && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
+        && make clean \
+        && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false $buildDeps
 
 RUN ln -sf /dev/stdout /var/log/apache2/access.log \
-	&& ln -sf /dev/stderr /var/log/apache2/error.log \
-	&& ln -sf /dev/stdout /var/log/websocket.log \
-    && ln -sf /dev/stderr /var/log/websocket.err \
-	&& a2enmod rewrite \
-	&& rm -rf /var/www/* \
-	&& chown -R www-data:www-data /var/www
+        && ln -sf /dev/stderr /var/log/apache2/error.log \
+        && ln -sf /dev/stdout /var/log/websocket.log \
+        && ln -sf /dev/stderr /var/log/websocket.err \
+        && a2enmod rewrite \
+        && rm -rf /var/www/* \
+        && chown -R www-data:www-data /var/www
+
+COPY php-cli.ini "${PHP_INI_DIR}"/
+COPY php-apache.ini "${PHP_INI_DIR}"/php-apache2handler.ini
 
-RUN curl https://getcomposer.org/composer.phar -o /usr/local/bin/composer && chmod +x /usr/local/bin/composer
+RUN pecl install pthreads
 
-RUN apt-get update && apt-get install -y git unzip --no-install-recommends && rm -rf /var/lib/apt/lists/*
+# Install Composer
+# ======================================================================================================================
+RUN curl https://getcomposer.org/composer.phar -o /usr/local/bin/composer \
+        && chmod +x /usr/local/bin/composer
 
-COPY php-cli.ini /etc/php7.0/cli/php.ini
+RUN apt-get update \
+        && apt-get install -y git unzip --no-install-recommends \
+        && rm -rf /var/lib/apt/lists/*
 
-RUN pecl install pthreads && mkdir -p /etc/php7.0/cli
+# Add pdo and db drivers
+# ======================================================================================================================
+
+COPY docker-php-ext-* /usr/local/bin/
+
+RUN buildDeps="libpq-dev libzip-dev " \
+        && apt-get update \
+        && apt-get install -y $buildDeps --no-install-recommends \
+        && rm -rf /var/lib/apt/lists/* \
+        && docker-php-ext-install pdo pdo_pgsql pgsql
+
+# Run everything
+# ======================================================================================================================
 
 COPY run.sh /usr/local/bin/
+
 WORKDIR /var/www
 
 EXPOSE 8180

docker/docker-php-ext-configure

@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+ext="$1"
+extDir="/usr/src/php/ext/$ext"
+if [ -z "$ext" ] || ! [ -d "$extDir" ]; then
+	echo >&2 "usage: $0 ext-name [configure flags]"
+	echo >&2 "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
+	echo >&2
+	echo >&2 'Possible values for ext-name:'
+	echo >&2 $(find /usr/src/php/ext -mindepth 2 -maxdepth 2 -type f -name 'config.m4' | cut -d/ -f6 | sort)
+	exit 1
+fi
+shift
+
+set -x
+cd "$extDir"
+phpize
+./configure "$@"

docker/docker-php-ext-enable

@@ -0,0 +1,83 @@
+#!/bin/sh
+set -e
+
+cd "$(php -r 'echo ini_get("extension_dir");')"
+
+usage() {
+	echo "usage: $0 [options] module-name [module-name ...]"
+	echo "   ie: $0 gd mysqli"
+	echo "       $0 pdo pdo_mysql"
+	echo "       $0 --ini-name 0-apc.ini apcu apc"
+	echo
+	echo 'Possible values for module-name:'
+	echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
+}
+
+opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
+eval set -- "$opts"
+
+iniName=
+while true; do
+	flag="$1"
+	shift
+	case "$flag" in
+		--help|-h|'-?') usage && exit 0 ;;
+		--ini-name) iniName="$1" && shift ;;
+		--) break ;;
+		*)
+			{
+				echo "error: unknown flag: $flag"
+				usage
+			} >&2
+			exit 1
+			;;
+	esac
+done
+
+modules=
+for module; do
+	if [ -z "$module" ]; then
+		continue
+	fi
+	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
+		# allow ".so" to be optional
+		module="$module.so"
+	fi
+	if ! [ -f "$module" ]; then
+		echo >&2 "error: $(readlink -f "$module") does not exist"
+		echo >&2
+		usage >&2
+		exit 1
+	fi
+	modules="$modules $module"
+done
+
+if [ -z "$modules" ]; then
+	usage >&2
+	exit 1
+fi
+
+for module in $modules; do
+	if nm -g "$module" | grep -q ' zend_extension_entry$'; then
+		# https://wiki.php.net/internals/extensions#loading_zend_extensions
+		line="zend_extension=$(readlink -f "$module")"
+	else
+		line="extension=$module"
+	fi
+
+	ext="$(basename "$module")"
+	ext="${ext%.*}"
+	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
+		# this isn't perfect, but it's better than nothing
+		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
+		echo >&2
+		echo >&2 "warning: $ext ($module) is already loaded!"
+		echo >&2
+		continue
+	fi
+
+	ini="${PHP_INI_DIR}/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	if ! grep -q "$line" "$ini" 2>/dev/null; then
+		echo "$line" >> "$ini"
+	fi
+done

docker/docker-php-ext-install

@@ -0,0 +1,79 @@
+#!/bin/sh
+set -e
+
+cd /usr/src/php/ext
+
+usage() {
+	echo "usage: $0 [-jN] ext-name [ext-name ...]"
+	echo "   ie: $0 gd mysqli"
+	echo "       $0 pdo pdo_mysql"
+	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
+	echo
+	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
+	echo
+	echo 'Possible values for ext-name:'
+	echo $(find /usr/src/php/ext -mindepth 2 -maxdepth 2 -type f -name 'config.m4' | cut -d/ -f6 | sort)
+}
+
+opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
+eval set -- "$opts"
+
+j=1
+while true; do
+	flag="$1"
+	shift
+	case "$flag" in
+		--help|-h|'-?') usage && exit 0 ;;
+		--jobs|-j) j="$1" && shift ;;
+		--) break ;;
+		*)
+			{
+				echo "error: unknown flag: $flag"
+				usage
+			} >&2
+			exit 1
+			;;
+	esac
+done
+
+exts=
+for ext; do
+	if [ -z "$ext" ]; then
+		continue
+	fi
+	if [ ! -d "$ext" ]; then
+		echo >&2 "error: $(pwd -P)/$ext does not exist"
+		echo >&2
+		usage >&2
+		exit 1
+	fi
+	exts="$exts $ext"
+done
+
+if [ -z "$exts" ]; then
+	usage >&2
+	exit 1
+fi
+
+if [ -e /lib/apk/db/installed ] && [ -n "$PHPIZE_DEPS" ]; then
+	apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
+fi
+
+for ext in $exts; do
+	(
+		cd "$ext"
+		[ -e Makefile ] || docker-php-ext-configure "$ext"
+		make -j"$j"
+		make -j"$j" install
+		find modules \
+			-maxdepth 1 \
+			-name '*.so' \
+			-exec basename '{}' ';' \
+				| xargs -r docker-php-ext-enable
+		make -j"$j" clean
+	)
+done
+
+if [ -e /lib/apk/db/installed ] && [ -n "$PHPIZE_DEPS" ]; then
+	apk del .phpize-deps
+fi

docker/php-apache.ini

@@ -0,0 +1 @@
+[PHP]