Introduce templates and a PHP 7.0-based variant

.travis.yml

@@ -2,16 +2,18 @@ language: bash
 services: docker
 
 env:
-  - VARIANT=apache
-  - VARIANT=fpm
+  - VARIANT=php5.6/apache
+  - VARIANT=php5.6/fpm
+  - VARIANT=php7.0/apache
+  - VARIANT=php7.0/fpm
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
 
 before_script:
   - env | sort
   - cd "$VARIANT"
-  - image="wordpress:$VARIANT"
+  - slash='/'; image="wordpress:${VARIANT//$slash/-}"
 
 script:
   - docker build -t "$image" .

Dockerfile.template

@@ -0,0 +1,37 @@
+FROM php:%%PHP_VERSION%%-%%VARIANT%%
+
+# install the PHP extensions we need
+RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev && rm -rf /var/lib/apt/lists/* \
+	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-install gd mysqli opcache
+
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=2'; \
+		echo 'opcache.fast_shutdown=1'; \
+		echo 'opcache.enable_cli=1'; \
+	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+%%VARIANT_EXTRAS%%
+VOLUME /var/www/html
+
+ENV WORDPRESS_VERSION %%WORDPRESS_VERSION%%
+ENV WORDPRESS_SHA1 %%WORDPRESS_SHA1%%
+
+RUN set -x \
+	&& curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz" \
+	&& echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
+# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
+	&& tar -xzf wordpress.tar.gz -C /usr/src/ \
+	&& rm wordpress.tar.gz \
+	&& chown -R www-data:www-data /usr/src/wordpress
+
+COPY docker-entrypoint.sh /usr/local/bin/
+RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
+
+# ENTRYPOINT resets CMD
+ENTRYPOINT ["docker-entrypoint.sh"]
+CMD ["%%CMD%%"]

generate-stackbrew-library.sh

@@ -1,9 +1,18 @@
 #!/bin/bash
 set -eu
 
+defaultPhpVersion='php5.6'
+defaultVariant='apache'
+
 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
+phpVersions=( "$@" )
+if [ ${#phpVersions[@]} -eq 0 ]; then
+	phpVersions=( php*.*/ )
+fi
+phpVersions=( "${phpVersions[@]%/}" )
+
 # get the most recent commit which modified any of "$@"
 fileCommit() {
 	git log -1 --format='format:%H' HEAD -- "$@"
@@ -41,35 +50,59 @@ join() {
 	echo "${out#$sep}"
 }
 
-for variant in apache fpm; do
-	commit="$(dirCommit "$variant")"
+for phpVersion in "${phpVersions[@]}"; do
+	for variant in apache fpm; do
+		dir="$phpVersion/$variant"
+		[ -f "$dir/Dockerfile" ] || continue
 
-	fullVersion="$(git show "$commit":"$variant/Dockerfile" | awk '$1 == "ENV" && $2 == "WORDPRESS_VERSION" { print $3; exit }')"
-	if [[ "$fullVersion" != *.*.* && "$fullVersion" == *.* ]]; then
-		fullVersion+='.0'
-	fi
+		commit="$(dirCommit "$dir")"
 
-	versionAliases=()
-	while [ "${fullVersion%.*}" != "$fullVersion" ]; do
-		versionAliases+=( $fullVersion )
-		fullVersion="${fullVersion%.*}"
-	done
-	versionAliases+=(
-		$fullVersion
-		latest
-	)
+		fullVersion="$(git show "$commit":"$dir/Dockerfile" | awk '$1 == "ENV" && $2 == "WORDPRESS_VERSION" { print $3; exit }')"
+		if [[ "$fullVersion" != *.*.* && "$fullVersion" == *.* ]]; then
+			fullVersion+='.0'
+		fi
+
+		versionAliases=()
+		while [ "${fullVersion%[.-]*}" != "$fullVersion" ]; do
+			versionAliases+=( $fullVersion )
+			fullVersion="${fullVersion%[.-]*}"
+		done
+		versionAliases+=(
+			$fullVersion
+			latest
+		)
+
+		phpVersionAliases=( "${versionAliases[@]/%/-$phpVersion}" )
+		phpVersionAliases=( "${phpVersionAliases[@]//latest-/}" )
 
-	variantAliases=( "${versionAliases[@]/%/-$variant}" )
-	variantAliases=( "${variantAliases[@]//latest-/}" )
+		variantAliases=( "${versionAliases[@]/%/-$variant}" )
+		variantAliases=( "${variantAliases[@]//latest-/}" )
 
-	if [ "$variant" = 'apache' ]; then
-		variantAliases+=( "${versionAliases[@]}" )
-	fi
+		phpVersionVariantAliases=( "${versionAliases[@]/%/-$phpVersion-$variant}" )
+		phpVersionVariantAliases=( "${phpVersionVariantAliases[@]//latest-/}" )
 
-	echo
-	cat <<-EOE
-		Tags: $(join ', ' "${variantAliases[@]}")
-		GitCommit: $commit
-		Directory: $variant
-	EOE
+		fullAliases=()
+
+		if [ "$phpVersion" = "$defaultPhpVersion" ]; then
+			fullAliases+=( "${variantAliases[@]}" )
+
+			if [ "$variant" = "$defaultVariant" ]; then
+				fullAliases+=( "${versionAliases[@]}" )
+			fi
+		fi
+		if [ "$variant" = "$defaultVariant" ]; then
+			fullAliases+=( "${phpVersionAliases[@]}" )
+		fi
+
+		fullAliases+=(
+			"${phpVersionVariantAliases[@]}"
+		)
+
+		echo
+		cat <<-EOE
+			Tags: $(join ', ' "${fullAliases[@]}")
+			GitCommit: $commit
+			Directory: $dir
+		EOE
+	done
 done

apache/Dockerfile → php5.6/apache/Dockerfile

@@ -1,7 +1,5 @@
 FROM php:5.6-apache
 
-RUN a2enmod rewrite expires
-
 # install the PHP extensions we need
 RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev && rm -rf /var/lib/apt/lists/* \
 	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
@@ -18,20 +16,24 @@ RUN { \
 		echo 'opcache.enable_cli=1'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+RUN a2enmod rewrite expires
+
 VOLUME /var/www/html
 
 ENV WORDPRESS_VERSION 4.6.1
 ENV WORDPRESS_SHA1 027e065d30a64720624a7404a1820e6c6fff1202
 
-# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
-RUN curl -o wordpress.tar.gz -SL https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz \
+RUN set -x \
+	&& curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz" \
 	&& echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
+# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
 	&& tar -xzf wordpress.tar.gz -C /usr/src/ \
 	&& rm wordpress.tar.gz \
 	&& chown -R www-data:www-data /usr/src/wordpress
 
-COPY docker-entrypoint.sh /entrypoint.sh
+COPY docker-entrypoint.sh /usr/local/bin/
+RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
 
-# grr, ENTRYPOINT resets CMD now
-ENTRYPOINT ["/entrypoint.sh"]
+# ENTRYPOINT resets CMD
+ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["apache2-foreground"]

fpm/Dockerfile → php5.6/fpm/Dockerfile

@@ -21,15 +21,17 @@ VOLUME /var/www/html
 ENV WORDPRESS_VERSION 4.6.1
 ENV WORDPRESS_SHA1 027e065d30a64720624a7404a1820e6c6fff1202
 
-# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
-RUN curl -o wordpress.tar.gz -SL https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz \
+RUN set -x \
+	&& curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz" \
 	&& echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
+# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
 	&& tar -xzf wordpress.tar.gz -C /usr/src/ \
 	&& rm wordpress.tar.gz \
 	&& chown -R www-data:www-data /usr/src/wordpress
 
-COPY docker-entrypoint.sh /entrypoint.sh
+COPY docker-entrypoint.sh /usr/local/bin/
+RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
 
-# grr, ENTRYPOINT resets CMD now
-ENTRYPOINT ["/entrypoint.sh"]
+# ENTRYPOINT resets CMD
+ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["php-fpm"]

php7.0/apache/Dockerfile

@@ -0,0 +1,39 @@
+FROM php:7.0-apache
+
+# install the PHP extensions we need
+RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev && rm -rf /var/lib/apt/lists/* \
+	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-install gd mysqli opcache
+
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=2'; \
+		echo 'opcache.fast_shutdown=1'; \
+		echo 'opcache.enable_cli=1'; \
+	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+
+RUN a2enmod rewrite expires
+
+VOLUME /var/www/html
+
+ENV WORDPRESS_VERSION 4.6.1
+ENV WORDPRESS_SHA1 027e065d30a64720624a7404a1820e6c6fff1202
+
+RUN set -x \
+	&& curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz" \
+	&& echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
+# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
+	&& tar -xzf wordpress.tar.gz -C /usr/src/ \
+	&& rm wordpress.tar.gz \
+	&& chown -R www-data:www-data /usr/src/wordpress
+
+COPY docker-entrypoint.sh /usr/local/bin/
+RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
+
+# ENTRYPOINT resets CMD
+ENTRYPOINT ["docker-entrypoint.sh"]
+CMD ["apache2-foreground"]