From bf49bb96ad1bbd5894f3bb318b81655dfc571d65 Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 1 Jan 2018 17:26:42 +0100 Subject: [PATCH 1/7] Add PHP 7.1 variant --- .travis.yml | 6 +- {apache-php7 => apache-php7.0}/Dockerfile | 0 .../docker-entrypoint.sh | 0 {apache-php7 => apache-php7.0}/makedb.php | 0 apache-php7.1/Dockerfile | 37 ++++++++++ .../docker-entrypoint.sh | 0 {fpm-php7 => apache-php7.1}/makedb.php | 0 {fpm-php7 => fpm-php7.0}/Dockerfile | 0 fpm-php7.0/docker-entrypoint.sh | 72 +++++++++++++++++++ fpm-php7.0/makedb.php | 46 ++++++++++++ fpm-php7.1/Dockerfile | 34 +++++++++ fpm-php7.1/docker-entrypoint.sh | 72 +++++++++++++++++++ fpm-php7.1/makedb.php | 46 ++++++++++++ update.php | 2 +- 14 files changed, 312 insertions(+), 3 deletions(-) rename {apache-php7 => apache-php7.0}/Dockerfile (100%) rename {apache-php7 => apache-php7.0}/docker-entrypoint.sh (100%) rename {apache-php7 => apache-php7.0}/makedb.php (100%) create mode 100755 apache-php7.1/Dockerfile rename {fpm-php7 => apache-php7.1}/docker-entrypoint.sh (100%) rename {fpm-php7 => apache-php7.1}/makedb.php (100%) rename {fpm-php7 => fpm-php7.0}/Dockerfile (100%) create mode 100755 fpm-php7.0/docker-entrypoint.sh create mode 100644 fpm-php7.0/makedb.php create mode 100755 fpm-php7.1/Dockerfile create mode 100755 fpm-php7.1/docker-entrypoint.sh create mode 100644 fpm-php7.1/makedb.php diff --git a/.travis.yml b/.travis.yml index f96cc08..dec3416 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,11 @@ services: docker env: - VARIANT=apache - - VARIANT=apache-php7 + - VARIANT=apache-php7.0 + - VARIANT=apache-php7.1 - VARIANT=fpm - - VARIANT=fpm-php7 + - VARIANT=fpm-php7.0 + - VARIANT=fpm-php7.1 install: - git clone https://github.com/docker-library/official-images.git ~/official-images diff --git a/apache-php7/Dockerfile b/apache-php7.0/Dockerfile similarity index 100% rename from apache-php7/Dockerfile rename to apache-php7.0/Dockerfile diff --git a/apache-php7/docker-entrypoint.sh b/apache-php7.0/docker-entrypoint.sh similarity index 100% rename from apache-php7/docker-entrypoint.sh rename to apache-php7.0/docker-entrypoint.sh diff --git a/apache-php7/makedb.php b/apache-php7.0/makedb.php similarity index 100% rename from apache-php7/makedb.php rename to apache-php7.0/makedb.php diff --git a/apache-php7.1/Dockerfile b/apache-php7.1/Dockerfile new file mode 100755 index 0000000..5aaf56e --- /dev/null +++ b/apache-php7.1/Dockerfile @@ -0,0 +1,37 @@ +FROM php:7.1-apache +MAINTAINER Michael Babker (@mbabker) + +# Disable remote database security requirements. +ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 + +# Enable Apache Rewrite Module +RUN a2enmod rewrite + +# Install PHP extensions +RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libmcrypt-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 +RUN docker-php-ext-install mcrypt +RUN docker-php-ext-install zip + +VOLUME /var/www/html + +# Define Joomla version and expected SHA1 signature +ENV JOOMLA_VERSION 3.8.2 +ENV JOOMLA_SHA1 e68745d55cc5b1a7bb46f72f4296c6550e088543 + +# 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/fpm-php7/docker-entrypoint.sh b/apache-php7.1/docker-entrypoint.sh similarity index 100% rename from fpm-php7/docker-entrypoint.sh rename to apache-php7.1/docker-entrypoint.sh diff --git a/fpm-php7/makedb.php b/apache-php7.1/makedb.php similarity index 100% rename from fpm-php7/makedb.php rename to apache-php7.1/makedb.php diff --git a/fpm-php7/Dockerfile b/fpm-php7.0/Dockerfile similarity index 100% rename from fpm-php7/Dockerfile rename to fpm-php7.0/Dockerfile diff --git a/fpm-php7.0/docker-entrypoint.sh b/fpm-php7.0/docker-entrypoint.sh new file mode 100755 index 0000000..8ac32f0 --- /dev/null +++ b/fpm-php7.0/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" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; 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 -o -e libraries/src/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.0/makedb.php b/fpm-php7.0/makedb.php new file mode 100644 index 0000000..502135c --- /dev/null +++ b/fpm-php7.0/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.1/Dockerfile b/fpm-php7.1/Dockerfile new file mode 100755 index 0000000..0c86eba --- /dev/null +++ b/fpm-php7.1/Dockerfile @@ -0,0 +1,34 @@ +FROM php:7.1-fpm +MAINTAINER Michael Babker (@mbabker) + +# Disable remote database security requirements. +ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 + +# Install PHP extensions +RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libmcrypt-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 +RUN docker-php-ext-install mcrypt +RUN docker-php-ext-install zip + +VOLUME /var/www/html + +# Define Joomla version and expected SHA1 signature +ENV JOOMLA_VERSION 3.8.2 +ENV JOOMLA_SHA1 e68745d55cc5b1a7bb46f72f4296c6550e088543 + +# 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.1/docker-entrypoint.sh b/fpm-php7.1/docker-entrypoint.sh new file mode 100755 index 0000000..8ac32f0 --- /dev/null +++ b/fpm-php7.1/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" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; 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 -o -e libraries/src/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.1/makedb.php b/fpm-php7.1/makedb.php new file mode 100644 index 0000000..502135c --- /dev/null +++ b/fpm-php7.1/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/update.php b/update.php index 76acd60..7afc897 100644 --- a/update.php +++ b/update.php @@ -74,7 +74,7 @@ if (!isset($signature)) exit(1); } -foreach (['apache', 'apache-php7', 'fpm', 'fpm-php7'] as $variant) +foreach (['apache', 'apache-php7.0', 'apache-php7.1', 'fpm', 'fpm-php7.0', 'fpm-php7.1'] as $variant) { $dockerfile = __DIR__ . "/$variant/Dockerfile"; From c78dfa4f2d16531322a939c5a935e33a45fd22f6 Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 1 Jan 2018 17:27:41 +0100 Subject: [PATCH 2/7] Remove execute permission on Dockerfile --- apache-php7.0/Dockerfile | 0 apache-php7.1/Dockerfile | 0 apache/Dockerfile | 0 fpm-php7.0/Dockerfile | 0 fpm-php7.1/Dockerfile | 0 fpm/Dockerfile | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 apache-php7.0/Dockerfile mode change 100755 => 100644 apache-php7.1/Dockerfile mode change 100755 => 100644 apache/Dockerfile mode change 100755 => 100644 fpm-php7.0/Dockerfile mode change 100755 => 100644 fpm-php7.1/Dockerfile mode change 100755 => 100644 fpm/Dockerfile diff --git a/apache-php7.0/Dockerfile b/apache-php7.0/Dockerfile old mode 100755 new mode 100644 diff --git a/apache-php7.1/Dockerfile b/apache-php7.1/Dockerfile old mode 100755 new mode 100644 diff --git a/apache/Dockerfile b/apache/Dockerfile old mode 100755 new mode 100644 diff --git a/fpm-php7.0/Dockerfile b/fpm-php7.0/Dockerfile old mode 100755 new mode 100644 diff --git a/fpm-php7.1/Dockerfile b/fpm-php7.1/Dockerfile old mode 100755 new mode 100644 diff --git a/fpm/Dockerfile b/fpm/Dockerfile old mode 100755 new mode 100644 From 54bb11cb6718349d93722e4fdfdc36f7c8b9c43c Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 30 Jan 2018 16:41:12 +0100 Subject: [PATCH 3/7] Add PHP 7.1 variants to generate-stackbrew-library.sh --- generate-stackbrew-library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index ebfad83..f7564ef 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -40,7 +40,7 @@ join() { echo "${out#$sep}" } -for variant in apache apache-php7 fpm fpm-php7; do +for variant in apache apache-php7.0 apache-php7.1 fpm fpm-php7.0 fpm-php7.1; do commit="$(dirCommit "$variant")" fullVersion="$(git show "$commit":"$variant/Dockerfile" | awk '$1 == "ENV" && $2 == "JOOMLA_VERSION" { print $3; exit }')" From ffff6b54195437d8b7c0e642d42123618d67f8c5 Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 30 Jan 2018 17:25:46 +0100 Subject: [PATCH 4/7] Add PHP 7.2 variants --- .travis.yml | 2 + apache-php7.2/Dockerfile | 36 +++++++++++++++ apache-php7.2/docker-entrypoint.sh | 72 ++++++++++++++++++++++++++++++ apache-php7.2/makedb.php | 46 +++++++++++++++++++ fpm-php7.2/Dockerfile | 33 ++++++++++++++ fpm-php7.2/docker-entrypoint.sh | 72 ++++++++++++++++++++++++++++++ fpm-php7.2/makedb.php | 46 +++++++++++++++++++ generate-stackbrew-library.sh | 2 +- 8 files changed, 308 insertions(+), 1 deletion(-) create mode 100644 apache-php7.2/Dockerfile create mode 100755 apache-php7.2/docker-entrypoint.sh create mode 100644 apache-php7.2/makedb.php create mode 100644 fpm-php7.2/Dockerfile create mode 100755 fpm-php7.2/docker-entrypoint.sh create mode 100644 fpm-php7.2/makedb.php diff --git a/.travis.yml b/.travis.yml index dec3416..a90e7de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,11 @@ env: - VARIANT=apache - VARIANT=apache-php7.0 - VARIANT=apache-php7.1 + - VARIANT=apache-php7.2 - VARIANT=fpm - VARIANT=fpm-php7.0 - VARIANT=fpm-php7.1 + - VARIANT=fpm-php7.2 install: - git clone https://github.com/docker-library/official-images.git ~/official-images diff --git a/apache-php7.2/Dockerfile b/apache-php7.2/Dockerfile new file mode 100644 index 0000000..6551657 --- /dev/null +++ b/apache-php7.2/Dockerfile @@ -0,0 +1,36 @@ +FROM php:7.2-apache +MAINTAINER Michael Babker (@mbabker) + +# Disable remote database security requirements. +ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 + +# Enable Apache Rewrite Module +RUN a2enmod rewrite + +# Install PHP extensions +RUN apt-get update && apt-get install -y libpng-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 +RUN docker-php-ext-install zip + +VOLUME /var/www/html + +# Define Joomla version and expected SHA1 signature +ENV JOOMLA_VERSION 3.8.2 +ENV JOOMLA_SHA1 e68745d55cc5b1a7bb46f72f4296c6550e088543 + +# 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.2/docker-entrypoint.sh b/apache-php7.2/docker-entrypoint.sh new file mode 100755 index 0000000..8ac32f0 --- /dev/null +++ b/apache-php7.2/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" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; 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 -o -e libraries/src/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.2/makedb.php b/apache-php7.2/makedb.php new file mode 100644 index 0000000..502135c --- /dev/null +++ b/apache-php7.2/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.2/Dockerfile b/fpm-php7.2/Dockerfile new file mode 100644 index 0000000..620ed5e --- /dev/null +++ b/fpm-php7.2/Dockerfile @@ -0,0 +1,33 @@ +FROM php:7.2-fpm +MAINTAINER Michael Babker (@mbabker) + +# Disable remote database security requirements. +ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 + +# Install PHP extensions +RUN apt-get update && apt-get install -y libpng-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 +RUN docker-php-ext-install zip + +VOLUME /var/www/html + +# Define Joomla version and expected SHA1 signature +ENV JOOMLA_VERSION 3.8.2 +ENV JOOMLA_SHA1 e68745d55cc5b1a7bb46f72f4296c6550e088543 + +# 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.2/docker-entrypoint.sh b/fpm-php7.2/docker-entrypoint.sh new file mode 100755 index 0000000..8ac32f0 --- /dev/null +++ b/fpm-php7.2/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" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; 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 -o -e libraries/src/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.2/makedb.php b/fpm-php7.2/makedb.php new file mode 100644 index 0000000..502135c --- /dev/null +++ b/fpm-php7.2/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 f7564ef..439e3cc 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -40,7 +40,7 @@ join() { echo "${out#$sep}" } -for variant in apache apache-php7.0 apache-php7.1 fpm fpm-php7.0 fpm-php7.1; do +for variant in apache apache-php7.0 apache-php7.1 apache-php7.2 fpm fpm-php7.0 fpm-php7.1 fpm-php7.2; do commit="$(dirCommit "$variant")" fullVersion="$(git show "$commit":"$variant/Dockerfile" | awk '$1 == "ENV" && $2 == "JOOMLA_VERSION" { print $3; exit }')" From 0d8188aeafea39602e2fcf0b82c7ba2d3b4a124c Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 30 Jan 2018 17:30:06 +0100 Subject: [PATCH 5/7] Replace deprecated MAINTAINER instruction --- apache-php7.1/Dockerfile | 2 +- apache-php7.2/Dockerfile | 2 +- fpm-php7.1/Dockerfile | 2 +- fpm-php7.2/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apache-php7.1/Dockerfile b/apache-php7.1/Dockerfile index 5aaf56e..39e283a 100644 --- a/apache-php7.1/Dockerfile +++ b/apache-php7.1/Dockerfile @@ -1,5 +1,5 @@ FROM php:7.1-apache -MAINTAINER Michael Babker (@mbabker) +LABEL maintainer="Michael Babker (@mbabker)" # Disable remote database security requirements. ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 diff --git a/apache-php7.2/Dockerfile b/apache-php7.2/Dockerfile index 6551657..c0e80e8 100644 --- a/apache-php7.2/Dockerfile +++ b/apache-php7.2/Dockerfile @@ -1,5 +1,5 @@ FROM php:7.2-apache -MAINTAINER Michael Babker (@mbabker) +LABEL maintainer="Michael Babker (@mbabker)" # Disable remote database security requirements. ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 diff --git a/fpm-php7.1/Dockerfile b/fpm-php7.1/Dockerfile index 0c86eba..23ed57d 100644 --- a/fpm-php7.1/Dockerfile +++ b/fpm-php7.1/Dockerfile @@ -1,5 +1,5 @@ FROM php:7.1-fpm -MAINTAINER Michael Babker (@mbabker) +LABEL maintainer="Michael Babker (@mbabker)" # Disable remote database security requirements. ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 diff --git a/fpm-php7.2/Dockerfile b/fpm-php7.2/Dockerfile index 620ed5e..b4164ba 100644 --- a/fpm-php7.2/Dockerfile +++ b/fpm-php7.2/Dockerfile @@ -1,5 +1,5 @@ FROM php:7.2-fpm -MAINTAINER Michael Babker (@mbabker) +LABEL maintainer="Michael Babker (@mbabker)" # Disable remote database security requirements. ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 From 4e07f7b5273f2992b57bf103932cd9a76f309f0d Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 30 Jan 2018 17:34:17 +0100 Subject: [PATCH 6/7] Add PHP 7.2 variants to update.php --- update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.php b/update.php index 7afc897..56e0eb8 100644 --- a/update.php +++ b/update.php @@ -74,7 +74,7 @@ if (!isset($signature)) exit(1); } -foreach (['apache', 'apache-php7.0', 'apache-php7.1', 'fpm', 'fpm-php7.0', 'fpm-php7.1'] as $variant) +foreach (['apache', 'apache-php7.0', 'apache-php7.1', 'apache-php7.2', 'fpm', 'fpm-php7.0', 'fpm-php7.1', 'fpm-php7.2'] as $variant) { $dockerfile = __DIR__ . "/$variant/Dockerfile"; From 17b45925ce6f362a7e8c8351d1552192766681c6 Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 30 Jan 2018 17:36:08 +0100 Subject: [PATCH 7/7] Also update Joomla version for new PHP variants --- apache-php7.1/Dockerfile | 4 ++-- apache-php7.2/Dockerfile | 4 ++-- fpm-php7.1/Dockerfile | 4 ++-- fpm-php7.2/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apache-php7.1/Dockerfile b/apache-php7.1/Dockerfile index 39e283a..04992f0 100644 --- a/apache-php7.1/Dockerfile +++ b/apache-php7.1/Dockerfile @@ -18,8 +18,8 @@ RUN docker-php-ext-install zip VOLUME /var/www/html # Define Joomla version and expected SHA1 signature -ENV JOOMLA_VERSION 3.8.2 -ENV JOOMLA_SHA1 e68745d55cc5b1a7bb46f72f4296c6550e088543 +ENV JOOMLA_VERSION 3.8.4 +ENV JOOMLA_SHA1 3d8a321e626cdf3823fc6bd62aee222fd12c19ec # 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 \ diff --git a/apache-php7.2/Dockerfile b/apache-php7.2/Dockerfile index c0e80e8..056e60a 100644 --- a/apache-php7.2/Dockerfile +++ b/apache-php7.2/Dockerfile @@ -17,8 +17,8 @@ RUN docker-php-ext-install zip VOLUME /var/www/html # Define Joomla version and expected SHA1 signature -ENV JOOMLA_VERSION 3.8.2 -ENV JOOMLA_SHA1 e68745d55cc5b1a7bb46f72f4296c6550e088543 +ENV JOOMLA_VERSION 3.8.4 +ENV JOOMLA_SHA1 3d8a321e626cdf3823fc6bd62aee222fd12c19ec # 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 \ diff --git a/fpm-php7.1/Dockerfile b/fpm-php7.1/Dockerfile index 23ed57d..f7aded3 100644 --- a/fpm-php7.1/Dockerfile +++ b/fpm-php7.1/Dockerfile @@ -15,8 +15,8 @@ RUN docker-php-ext-install zip VOLUME /var/www/html # Define Joomla version and expected SHA1 signature -ENV JOOMLA_VERSION 3.8.2 -ENV JOOMLA_SHA1 e68745d55cc5b1a7bb46f72f4296c6550e088543 +ENV JOOMLA_VERSION 3.8.4 +ENV JOOMLA_SHA1 3d8a321e626cdf3823fc6bd62aee222fd12c19ec # 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 \ diff --git a/fpm-php7.2/Dockerfile b/fpm-php7.2/Dockerfile index b4164ba..5eb9f6e 100644 --- a/fpm-php7.2/Dockerfile +++ b/fpm-php7.2/Dockerfile @@ -14,8 +14,8 @@ RUN docker-php-ext-install zip VOLUME /var/www/html # Define Joomla version and expected SHA1 signature -ENV JOOMLA_VERSION 3.8.2 -ENV JOOMLA_SHA1 e68745d55cc5b1a7bb46f72f4296c6550e088543 +ENV JOOMLA_VERSION 3.8.4 +ENV JOOMLA_SHA1 3d8a321e626cdf3823fc6bd62aee222fd12c19ec # 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 \