Skip to content

Commit

Permalink
Merge pull request #42 from tilosp-docker/php5.6
Browse files Browse the repository at this point in the history
Changed the php version back to 5.6 for Nextcloud 9 and 10
  • Loading branch information
pierreozoux authored Mar 13, 2017
2 parents 362905d + 4139674 commit cdd12cc
Show file tree
Hide file tree
Showing 7 changed files with 96 additions and 26 deletions.
10 changes: 5 additions & 5 deletions 10.0/apache/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.1-apache
FROM php:5.6-apache

RUN apt-get update && apt-get install -y \
bzip2 \
Expand All @@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y \
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip

# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
Expand All @@ -33,9 +33,9 @@ RUN a2enmod rewrite

# PECL extensions
RUN set -ex \
&& pecl install APCu-5.1.8 \
&& pecl install memcached-3.0.2 \
&& pecl install redis-3.1.1 \
&& pecl install APCu-4.0.10 \
&& pecl install memcached-2.2.0 \
&& pecl install redis-2.2.8 \
&& docker-php-ext-enable apcu redis memcached
RUN a2enmod rewrite

Expand Down
10 changes: 5 additions & 5 deletions 10.0/fpm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.1-fpm
FROM php:5.6-fpm

RUN apt-get update && apt-get install -y \
bzip2 \
Expand All @@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y \
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip

# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
Expand All @@ -32,9 +32,9 @@ RUN { \

# PECL extensions
RUN set -ex \
&& pecl install APCu-5.1.8 \
&& pecl install memcached-3.0.2 \
&& pecl install redis-3.1.1 \
&& pecl install APCu-4.0.10 \
&& pecl install memcached-2.2.0 \
&& pecl install redis-2.2.8 \
&& docker-php-ext-enable apcu redis memcached

ENV NEXTCLOUD_VERSION 10.0.4
Expand Down
10 changes: 5 additions & 5 deletions 9.0/apache/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.1-apache
FROM php:5.6-apache

RUN apt-get update && apt-get install -y \
bzip2 \
Expand All @@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y \
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip

# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
Expand All @@ -33,9 +33,9 @@ RUN a2enmod rewrite

# PECL extensions
RUN set -ex \
&& pecl install APCu-5.1.8 \
&& pecl install memcached-3.0.2 \
&& pecl install redis-3.1.1 \
&& pecl install APCu-4.0.10 \
&& pecl install memcached-2.2.0 \
&& pecl install redis-2.2.8 \
&& docker-php-ext-enable apcu redis memcached
RUN a2enmod rewrite

Expand Down
10 changes: 5 additions & 5 deletions 9.0/fpm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.1-fpm
FROM php:5.6-fpm

RUN apt-get update && apt-get install -y \
bzip2 \
Expand All @@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y \
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip

# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
Expand All @@ -32,9 +32,9 @@ RUN { \

# PECL extensions
RUN set -ex \
&& pecl install APCu-5.1.8 \
&& pecl install memcached-3.0.2 \
&& pecl install redis-3.1.1 \
&& pecl install APCu-4.0.10 \
&& pecl install memcached-2.2.0 \
&& pecl install redis-2.2.8 \
&& docker-php-ext-enable apcu redis memcached

ENV NEXTCLOUD_VERSION 9.0.57
Expand Down
60 changes: 60 additions & 0 deletions Dockerfile-php7.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
FROM php:7.1-%%VARIANT%%

RUN apt-get update && apt-get install -y \
bzip2 \
libcurl4-openssl-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
libldap2-dev \
libmcrypt-dev \
libmemcached-dev \
libpng12-dev \
libpq-dev \
libxml2-dev \
&& rm -rf /var/lib/apt/lists/*

# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip

# 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=60'; \
echo 'opcache.fast_shutdown=1'; \
echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
RUN a2enmod rewrite

# PECL extensions
RUN set -ex \
&& pecl install APCu-5.1.8 \
&& pecl install memcached-3.0.2 \
&& pecl install redis-3.1.1 \
&& docker-php-ext-enable apcu redis memcached
RUN a2enmod rewrite

ENV NEXTCLOUD_VERSION %%VERSION%%
VOLUME /var/www/html

RUN curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
&& curl -fsSL -o nextcloud.tar.bz2.asc \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc" \
&& export GNUPGHOME="$(mktemp -d)" \
# gpg key from https://nextcloud.com/nextcloud.asc
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A \
&& gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2 \
&& rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc \
&& tar -xjf nextcloud.tar.bz2 -C /usr/src/ \
&& rm nextcloud.tar.bz2

COPY docker-entrypoint.sh /entrypoint.sh

ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"]
10 changes: 5 additions & 5 deletions Dockerfile.template
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.1-%%VARIANT%%
FROM php:5.6-%%VARIANT%%

RUN apt-get update && apt-get install -y \
bzip2 \
Expand All @@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y \
# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
&& docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip

# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
Expand All @@ -33,9 +33,9 @@ RUN a2enmod rewrite

# PECL extensions
RUN set -ex \
&& pecl install APCu-5.1.8 \
&& pecl install memcached-3.0.2 \
&& pecl install redis-3.1.1 \
&& pecl install APCu-4.0.10 \
&& pecl install memcached-2.2.0 \
&& pecl install redis-2.2.8 \
&& docker-php-ext-enable apcu redis memcached
RUN a2enmod rewrite

Expand Down
12 changes: 11 additions & 1 deletion update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ declare -A cmd=(
[fpm]='php-fpm'
)

# version_greater_or_equal A B returns whether A >= B
function version_greater_or_equal() {
[[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" || "$1" == "$2" ]];
}

latests=( $(curl -sSL 'https://nextcloud.com/changelog/' |tac|tac| \
grep -o "\(Version\|Release\)\s\+[[:digit:]]\+\(\.[[:digit:]]\+\)\+" | \
awk '{ print $2 }' | sort -V ) )
Expand All @@ -16,7 +21,12 @@ for latest in "${latests[@]}"; do
for variant in apache fpm; do
# Create the version+variant directory with a Dockerfile.
mkdir -p "$version/$variant"
cp Dockerfile.template "$version/$variant/Dockerfile"

template="Dockerfile.template"
if version_greater_or_equal "$version" "11.0"; then
template="Dockerfile-php7.template"
fi
cp "$template" "$version/$variant/Dockerfile"

echo "updating $latest [$version] $variant"

Expand Down

0 comments on commit cdd12cc

Please sign in to comment.