From 9525cc2871b97f02041c109f1d2bf3fc2be2f419 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Tue, 22 Mar 2016 15:36:36 -0400 Subject: [PATCH] Add PHP 7 compatible images (Fix #3) --- apache-php7/Dockerfile | 32 ++++++++++++++ apache-php7/docker-entrypoint.sh | 72 ++++++++++++++++++++++++++++++++ apache-php7/makedb.php | 46 ++++++++++++++++++++ fpm-php7/Dockerfile | 29 +++++++++++++ fpm-php7/docker-entrypoint.sh | 72 ++++++++++++++++++++++++++++++++ fpm-php7/makedb.php | 46 ++++++++++++++++++++ generate-stackbrew-library.sh | 2 +- update.sh | 2 +- 8 files changed, 299 insertions(+), 2 deletions(-) create mode 100755 apache-php7/Dockerfile create mode 100755 apache-php7/docker-entrypoint.sh create mode 100644 apache-php7/makedb.php create mode 100755 fpm-php7/Dockerfile create mode 100755 fpm-php7/docker-entrypoint.sh create mode 100644 fpm-php7/makedb.php diff --git a/apache-php7/Dockerfile b/apache-php7/Dockerfile new file mode 100755 index 0000000..e6f942d --- /dev/null +++ b/apache-php7/Dockerfile @@ -0,0 +1,32 @@ +FROM php:7.0-apache +MAINTAINER Michael Babker (@mbabker) + +# Enable Apache Rewrite Module +RUN a2enmod rewrite + +# Install PHP extensions +RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev zip unzip && rm -rf /var/lib/apt/lists/* \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-install gd +RUN docker-php-ext-install mysqli + +VOLUME /var/www/html + +# Define Joomla version and expected SHA1 signature +ENV JOOMLA_VERSION 3.5.0 +ENV JOOMLA_SHA1 8c88f079f31774adc9d2682067beabc057c541aa + +# Download package and extract to web volume +RUN curl -o joomla.zip -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.zip \ + && echo "$JOOMLA_SHA1 *joomla.zip" | sha1sum -c - \ + && mkdir /usr/src/joomla \ + && unzip joomla.zip -d /usr/src/joomla \ + && rm joomla.zip \ + && chown -R www-data:www-data /usr/src/joomla + +# Copy init scripts and custom .htaccess +COPY docker-entrypoint.sh /entrypoint.sh +COPY makedb.php /makedb.php + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["apache2-foreground"] diff --git a/apache-php7/docker-entrypoint.sh b/apache-php7/docker-entrypoint.sh new file mode 100755 index 0000000..0f1acae --- /dev/null +++ b/apache-php7/docker-entrypoint.sh @@ -0,0 +1,72 @@ +#!/bin/bash + +set -e + +if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then + if [ -n "$MYSQL_PORT_3306_TCP" ]; then + if [ -z "$JOOMLA_DB_HOST" ]; then + JOOMLA_DB_HOST='mysql' + else + echo >&2 "warning: both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" + echo >&2 " Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" + echo >&2 " instead of the linked mysql container" + fi + fi + + if [ -z "$JOOMLA_DB_HOST" ]; then + echo >&2 "error: missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables" + echo >&2 " Did you forget to --link some_mysql_container:mysql or set an external db" + echo >&2 " with -e JOOMLA_DB_HOST=hostname:port?" + exit 1 + fi + + # If the DB user is 'root' then use the MySQL root password env var + : ${JOOMLA_DB_USER:=root} + if [ "$JOOMLA_DB_USER" = 'root' ]; then + : ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD} + fi + : ${JOOMLA_DB_NAME:=joomla} + + if [ -z "$JOOMLA_DB_PASSWORD" ]; then + echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable" + echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?" + echo >&2 + echo >&2 " (Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" + exit 1 + fi + + if ! [ -e index.php -a -e libraries/cms/version/version.php ]; then + echo >&2 "Joomla not found in $(pwd) - copying now..." + + if [ "$(ls -A)" ]; then + echo >&2 "WARNING: $(pwd) is not empty - press Ctrl+C now if this is an error!" + ( set -x; ls -A; sleep 10 ) + fi + + tar cf - --one-file-system -C /usr/src/joomla . | tar xf - + + if [ ! -e .htaccess ]; then + # NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess + sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt > .htaccess + chown www-data:www-data .htaccess + fi + + echo >&2 "Complete! Joomla has been successfully copied to $(pwd)" + fi + + # Ensure the MySQL Database is created + php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 "You will need the following database information to install Joomla:" + echo >&2 "Host Name: $JOOMLA_DB_HOST" + echo >&2 "Database Name: $JOOMLA_DB_NAME" + echo >&2 "Database Username: $JOOMLA_DB_USER" + echo >&2 "Database Password: $JOOMLA_DB_PASSWORD" + echo >&2 + echo >&2 "========================================================================" +fi + +exec "$@" diff --git a/apache-php7/makedb.php b/apache-php7/makedb.php new file mode 100644 index 0000000..502135c --- /dev/null +++ b/apache-php7/makedb.php @@ -0,0 +1,46 @@ + makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME" +$stderr = fopen('php://stderr', 'w'); +fwrite($stderr, "\nEnsuring Joomla database is present\n"); + +if (strpos($argv[1], ':') !== false) +{ + list($host, $port) = explode(':', $argv[1], 2); +} +else +{ + $host = $argv[1]; + $port = 3306; +} + +$maxTries = 10; + +do +{ + $mysql = new mysqli($host, $argv[2], $argv[3], '', (int) $port); + + if ($mysql->connect_error) + { + fwrite($stderr, "\nMySQL Connection Error: ({$mysql->connect_errno}) {$mysql->connect_error}\n"); + --$maxTries; + + if ($maxTries <= 0) + { + exit(1); + } + + sleep(3); + } +} +while ($mysql->connect_error); + +if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($argv[4]) . '`')) +{ + fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n"); + $mysql->close(); + exit(1); +} + +fwrite($stderr, "\nMySQL Database Created\n"); + +$mysql->close(); diff --git a/fpm-php7/Dockerfile b/fpm-php7/Dockerfile new file mode 100755 index 0000000..f314d3c --- /dev/null +++ b/fpm-php7/Dockerfile @@ -0,0 +1,29 @@ +FROM php:7.0-fpm +MAINTAINER Michael Babker (@mbabker) + +# Install PHP extensions +RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev zip unzip && rm -rf /var/lib/apt/lists/* \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-install gd +RUN docker-php-ext-install mysqli + +VOLUME /var/www/html + +# Define Joomla version and expected SHA1 signature +ENV JOOMLA_VERSION 3.5.0 +ENV JOOMLA_SHA1 8c88f079f31774adc9d2682067beabc057c541aa + +# Download package and extract to web volume +RUN curl -o joomla.zip -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.zip \ + && echo "$JOOMLA_SHA1 *joomla.zip" | sha1sum -c - \ + && mkdir /usr/src/joomla \ + && unzip joomla.zip -d /usr/src/joomla \ + && rm joomla.zip \ + && chown -R www-data:www-data /usr/src/joomla + +# Copy init scripts and custom .htaccess +COPY docker-entrypoint.sh /entrypoint.sh +COPY makedb.php /makedb.php + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["php-fpm"] diff --git a/fpm-php7/docker-entrypoint.sh b/fpm-php7/docker-entrypoint.sh new file mode 100755 index 0000000..0f1acae --- /dev/null +++ b/fpm-php7/docker-entrypoint.sh @@ -0,0 +1,72 @@ +#!/bin/bash + +set -e + +if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then + if [ -n "$MYSQL_PORT_3306_TCP" ]; then + if [ -z "$JOOMLA_DB_HOST" ]; then + JOOMLA_DB_HOST='mysql' + else + echo >&2 "warning: both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" + echo >&2 " Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" + echo >&2 " instead of the linked mysql container" + fi + fi + + if [ -z "$JOOMLA_DB_HOST" ]; then + echo >&2 "error: missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables" + echo >&2 " Did you forget to --link some_mysql_container:mysql or set an external db" + echo >&2 " with -e JOOMLA_DB_HOST=hostname:port?" + exit 1 + fi + + # If the DB user is 'root' then use the MySQL root password env var + : ${JOOMLA_DB_USER:=root} + if [ "$JOOMLA_DB_USER" = 'root' ]; then + : ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD} + fi + : ${JOOMLA_DB_NAME:=joomla} + + if [ -z "$JOOMLA_DB_PASSWORD" ]; then + echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable" + echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?" + echo >&2 + echo >&2 " (Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" + exit 1 + fi + + if ! [ -e index.php -a -e libraries/cms/version/version.php ]; then + echo >&2 "Joomla not found in $(pwd) - copying now..." + + if [ "$(ls -A)" ]; then + echo >&2 "WARNING: $(pwd) is not empty - press Ctrl+C now if this is an error!" + ( set -x; ls -A; sleep 10 ) + fi + + tar cf - --one-file-system -C /usr/src/joomla . | tar xf - + + if [ ! -e .htaccess ]; then + # NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess + sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt > .htaccess + chown www-data:www-data .htaccess + fi + + echo >&2 "Complete! Joomla has been successfully copied to $(pwd)" + fi + + # Ensure the MySQL Database is created + php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 "You will need the following database information to install Joomla:" + echo >&2 "Host Name: $JOOMLA_DB_HOST" + echo >&2 "Database Name: $JOOMLA_DB_NAME" + echo >&2 "Database Username: $JOOMLA_DB_USER" + echo >&2 "Database Password: $JOOMLA_DB_PASSWORD" + echo >&2 + echo >&2 "========================================================================" +fi + +exec "$@" diff --git a/fpm-php7/makedb.php b/fpm-php7/makedb.php new file mode 100644 index 0000000..502135c --- /dev/null +++ b/fpm-php7/makedb.php @@ -0,0 +1,46 @@ + makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME" +$stderr = fopen('php://stderr', 'w'); +fwrite($stderr, "\nEnsuring Joomla database is present\n"); + +if (strpos($argv[1], ':') !== false) +{ + list($host, $port) = explode(':', $argv[1], 2); +} +else +{ + $host = $argv[1]; + $port = 3306; +} + +$maxTries = 10; + +do +{ + $mysql = new mysqli($host, $argv[2], $argv[3], '', (int) $port); + + if ($mysql->connect_error) + { + fwrite($stderr, "\nMySQL Connection Error: ({$mysql->connect_errno}) {$mysql->connect_error}\n"); + --$maxTries; + + if ($maxTries <= 0) + { + exit(1); + } + + sleep(3); + } +} +while ($mysql->connect_error); + +if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($argv[4]) . '`')) +{ + fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n"); + $mysql->close(); + exit(1); +} + +fwrite($stderr, "\nMySQL Database Created\n"); + +$mysql->close(); diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 0a87504..3240ab3 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -9,7 +9,7 @@ echo '# maintainer: Michael Babker (@mbabker)' defaultVariant='apache' -for variant in apache fpm; do +for variant in apache apache-php7 fpm fpm-php7; do commit="$(git log -1 --format='format:%H' -- "$variant")" fullVersion="$(grep -m1 'ENV JOOMLA_VERSION ' "$variant/Dockerfile" | cut -d' ' -f3)" diff --git a/update.sh b/update.sh index 2ae02a8..1900b02 100755 --- a/update.sh +++ b/update.sh @@ -8,7 +8,7 @@ current="$(curl -A 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_4) AppleWebKit/ wget -O joomla.zip https://github.com/joomla/joomla-cms/releases/download/$current/Joomla_$current-Stable-Full_Package.zip sha1="$(sha1sum joomla.zip | sed -r 's/ .*//')" -for variant in apache fpm; do +for variant in apache apache-php7 fpm fpm-php7; do ( set -x