Add PHP 7 compatible images (Fix #3)
This commit is contained in:
Michael Babker
parent
ff7a922883
commit
9525cc2871
|
|
@ -0,0 +1,32 @@
|
|||
FROM php:7.0-apache
|
||||
MAINTAINER Michael Babker <michael.babker@joomla.org> (@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"]
|
||||
|
|
@ -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 "$@"
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
<?php
|
||||
// Args: 0 => 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();
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
FROM php:7.0-fpm
|
||||
MAINTAINER Michael Babker <michael.babker@joomla.org> (@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"]
|
||||
|
|
@ -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 "$@"
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
<?php
|
||||
// Args: 0 => 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();
|
||||
|
|
@ -9,7 +9,7 @@ echo '# maintainer: Michael Babker <michael.babker@joomla.org> (@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)"
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue