From 0ad90b9ce9bac2747d2b79d8c991bb79df66243d Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Sun, 12 Feb 2017 15:13:18 +0100 Subject: [PATCH 1/5] Update to PHP 7.1 --- 10.0/apache/Dockerfile | 2 +- 10.0/fpm/Dockerfile | 2 +- 11.0/apache/Dockerfile | 2 +- 11.0/fpm/Dockerfile | 2 +- 9.0/apache/Dockerfile | 2 +- 9.0/fpm/Dockerfile | 2 +- Dockerfile.template | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/10.0/apache/Dockerfile b/10.0/apache/Dockerfile index 4356509..55ce3a0 100644 --- a/10.0/apache/Dockerfile +++ b/10.0/apache/Dockerfile @@ -1,4 +1,4 @@ -FROM php:5.6-apache +FROM php:7.1-apache RUN apt-get update && apt-get install -y \ bzip2 \ diff --git a/10.0/fpm/Dockerfile b/10.0/fpm/Dockerfile index 1a365e6..73b8510 100644 --- a/10.0/fpm/Dockerfile +++ b/10.0/fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:5.6-fpm +FROM php:7.1-fpm RUN apt-get update && apt-get install -y \ bzip2 \ diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile index d645d8b..77267e9 100644 --- a/11.0/apache/Dockerfile +++ b/11.0/apache/Dockerfile @@ -1,4 +1,4 @@ -FROM php:5.6-apache +FROM php:7.1-apache RUN apt-get update && apt-get install -y \ bzip2 \ diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile index 35c1264..0f2bba5 100644 --- a/11.0/fpm/Dockerfile +++ b/11.0/fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:5.6-fpm +FROM php:7.1-fpm RUN apt-get update && apt-get install -y \ bzip2 \ diff --git a/9.0/apache/Dockerfile b/9.0/apache/Dockerfile index 3fead99..8015aba 100644 --- a/9.0/apache/Dockerfile +++ b/9.0/apache/Dockerfile @@ -1,4 +1,4 @@ -FROM php:5.6-apache +FROM php:7.1-apache RUN apt-get update && apt-get install -y \ bzip2 \ diff --git a/9.0/fpm/Dockerfile b/9.0/fpm/Dockerfile index 9d41eaf..15d21ee 100644 --- a/9.0/fpm/Dockerfile +++ b/9.0/fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:5.6-fpm +FROM php:7.1-fpm RUN apt-get update && apt-get install -y \ bzip2 \ diff --git a/Dockerfile.template b/Dockerfile.template index 3d71379..c319834 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -1,4 +1,4 @@ -FROM php:5.6-%%VARIANT%% +FROM php:7.1-%%VARIANT%% RUN apt-get update && apt-get install -y \ bzip2 \ From fed8d8085b7d7d62b920bd36841e6d8702847fe8 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Wed, 15 Feb 2017 09:39:53 +0100 Subject: [PATCH 2/5] Change mysql to mysqli --- 10.0/apache/Dockerfile | 2 +- 10.0/fpm/Dockerfile | 2 +- 11.0/apache/Dockerfile | 2 +- 11.0/fpm/Dockerfile | 2 +- 9.0/apache/Dockerfile | 2 +- 9.0/fpm/Dockerfile | 2 +- Dockerfile.template | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/10.0/apache/Dockerfile b/10.0/apache/Dockerfile index 55ce3a0..a3bafed 100644 --- a/10.0/apache/Dockerfile +++ b/10.0/apache/Dockerfile @@ -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 mysql opcache pdo_mysql pdo_pgsql pgsql zip + && 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 diff --git a/10.0/fpm/Dockerfile b/10.0/fpm/Dockerfile index 73b8510..9a4a388 100644 --- a/10.0/fpm/Dockerfile +++ b/10.0/fpm/Dockerfile @@ -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 mysql opcache pdo_mysql pdo_pgsql pgsql zip + && 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 diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile index 77267e9..e41c5d2 100644 --- a/11.0/apache/Dockerfile +++ b/11.0/apache/Dockerfile @@ -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 mysql opcache pdo_mysql pdo_pgsql pgsql zip + && 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 diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile index 0f2bba5..7b1a35a 100644 --- a/11.0/fpm/Dockerfile +++ b/11.0/fpm/Dockerfile @@ -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 mysql opcache pdo_mysql pdo_pgsql pgsql zip + && 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 diff --git a/9.0/apache/Dockerfile b/9.0/apache/Dockerfile index 8015aba..ce5f1bc 100644 --- a/9.0/apache/Dockerfile +++ b/9.0/apache/Dockerfile @@ -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 mysql opcache pdo_mysql pdo_pgsql pgsql zip + && 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 diff --git a/9.0/fpm/Dockerfile b/9.0/fpm/Dockerfile index 15d21ee..83c8b70 100644 --- a/9.0/fpm/Dockerfile +++ b/9.0/fpm/Dockerfile @@ -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 mysql opcache pdo_mysql pdo_pgsql pgsql zip + && 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 diff --git a/Dockerfile.template b/Dockerfile.template index c319834..1b577c4 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -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 mysql opcache pdo_mysql pdo_pgsql pgsql zip + && 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 From 73065ada5f81edbdd2606161c0d7f8fe0c61c356 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Wed, 15 Feb 2017 13:13:39 +0100 Subject: [PATCH 3/5] Update to memcached version 3.0.2 --- 10.0/apache/Dockerfile | 2 +- 10.0/fpm/Dockerfile | 2 +- 11.0/apache/Dockerfile | 2 +- 11.0/fpm/Dockerfile | 2 +- 9.0/apache/Dockerfile | 2 +- 9.0/fpm/Dockerfile | 2 +- Dockerfile.template | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/10.0/apache/Dockerfile b/10.0/apache/Dockerfile index a3bafed..0135c4b 100644 --- a/10.0/apache/Dockerfile +++ b/10.0/apache/Dockerfile @@ -34,7 +34,7 @@ RUN a2enmod rewrite # PECL extensions RUN set -ex \ && pecl install APCu-4.0.10 \ - && pecl install memcached-2.2.0 \ + && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached RUN a2enmod rewrite diff --git a/10.0/fpm/Dockerfile b/10.0/fpm/Dockerfile index 9a4a388..cbf91e5 100644 --- a/10.0/fpm/Dockerfile +++ b/10.0/fpm/Dockerfile @@ -33,7 +33,7 @@ RUN { \ # PECL extensions RUN set -ex \ && pecl install APCu-4.0.10 \ - && pecl install memcached-2.2.0 \ + && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile index e41c5d2..3b6ba64 100644 --- a/11.0/apache/Dockerfile +++ b/11.0/apache/Dockerfile @@ -34,7 +34,7 @@ RUN a2enmod rewrite # PECL extensions RUN set -ex \ && pecl install APCu-4.0.10 \ - && pecl install memcached-2.2.0 \ + && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached RUN a2enmod rewrite diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile index 7b1a35a..bf9ab18 100644 --- a/11.0/fpm/Dockerfile +++ b/11.0/fpm/Dockerfile @@ -33,7 +33,7 @@ RUN { \ # PECL extensions RUN set -ex \ && pecl install APCu-4.0.10 \ - && pecl install memcached-2.2.0 \ + && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached diff --git a/9.0/apache/Dockerfile b/9.0/apache/Dockerfile index ce5f1bc..5579b8c 100644 --- a/9.0/apache/Dockerfile +++ b/9.0/apache/Dockerfile @@ -34,7 +34,7 @@ RUN a2enmod rewrite # PECL extensions RUN set -ex \ && pecl install APCu-4.0.10 \ - && pecl install memcached-2.2.0 \ + && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached RUN a2enmod rewrite diff --git a/9.0/fpm/Dockerfile b/9.0/fpm/Dockerfile index 83c8b70..16fa524 100644 --- a/9.0/fpm/Dockerfile +++ b/9.0/fpm/Dockerfile @@ -33,7 +33,7 @@ RUN { \ # PECL extensions RUN set -ex \ && pecl install APCu-4.0.10 \ - && pecl install memcached-2.2.0 \ + && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached diff --git a/Dockerfile.template b/Dockerfile.template index 1b577c4..94d1eab 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -34,7 +34,7 @@ RUN a2enmod rewrite # PECL extensions RUN set -ex \ && pecl install APCu-4.0.10 \ - && pecl install memcached-2.2.0 \ + && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached RUN a2enmod rewrite From 31140a21fa4dd7f92ede7968832f7533fe3cfe88 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Wed, 15 Feb 2017 19:25:51 +0100 Subject: [PATCH 4/5] Update to APCu version 5.1.8 --- 10.0/apache/Dockerfile | 2 +- 10.0/fpm/Dockerfile | 2 +- 11.0/apache/Dockerfile | 2 +- 11.0/fpm/Dockerfile | 2 +- 9.0/apache/Dockerfile | 2 +- 9.0/fpm/Dockerfile | 2 +- Dockerfile.template | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/10.0/apache/Dockerfile b/10.0/apache/Dockerfile index 0135c4b..b7dbd85 100644 --- a/10.0/apache/Dockerfile +++ b/10.0/apache/Dockerfile @@ -33,7 +33,7 @@ RUN a2enmod rewrite # PECL extensions RUN set -ex \ - && pecl install APCu-4.0.10 \ + && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached diff --git a/10.0/fpm/Dockerfile b/10.0/fpm/Dockerfile index cbf91e5..e8fd32c 100644 --- a/10.0/fpm/Dockerfile +++ b/10.0/fpm/Dockerfile @@ -32,7 +32,7 @@ RUN { \ # PECL extensions RUN set -ex \ - && pecl install APCu-4.0.10 \ + && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile index 3b6ba64..a780008 100644 --- a/11.0/apache/Dockerfile +++ b/11.0/apache/Dockerfile @@ -33,7 +33,7 @@ RUN a2enmod rewrite # PECL extensions RUN set -ex \ - && pecl install APCu-4.0.10 \ + && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile index bf9ab18..670fe8f 100644 --- a/11.0/fpm/Dockerfile +++ b/11.0/fpm/Dockerfile @@ -32,7 +32,7 @@ RUN { \ # PECL extensions RUN set -ex \ - && pecl install APCu-4.0.10 \ + && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached diff --git a/9.0/apache/Dockerfile b/9.0/apache/Dockerfile index 5579b8c..f4c2909 100644 --- a/9.0/apache/Dockerfile +++ b/9.0/apache/Dockerfile @@ -33,7 +33,7 @@ RUN a2enmod rewrite # PECL extensions RUN set -ex \ - && pecl install APCu-4.0.10 \ + && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached diff --git a/9.0/fpm/Dockerfile b/9.0/fpm/Dockerfile index 16fa524..c0e7683 100644 --- a/9.0/fpm/Dockerfile +++ b/9.0/fpm/Dockerfile @@ -32,7 +32,7 @@ RUN { \ # PECL extensions RUN set -ex \ - && pecl install APCu-4.0.10 \ + && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached diff --git a/Dockerfile.template b/Dockerfile.template index 94d1eab..a796225 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -33,7 +33,7 @@ RUN a2enmod rewrite # PECL extensions RUN set -ex \ - && pecl install APCu-4.0.10 \ + && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached From 14c6743817baba94d8cdd2e065d3fa75929646be Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Wed, 15 Feb 2017 19:47:59 +0100 Subject: [PATCH 5/5] Update to redis version 3.1.1 --- 10.0/apache/Dockerfile | 2 +- 10.0/fpm/Dockerfile | 2 +- 11.0/apache/Dockerfile | 2 +- 11.0/fpm/Dockerfile | 2 +- 9.0/apache/Dockerfile | 2 +- 9.0/fpm/Dockerfile | 2 +- Dockerfile.template | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/10.0/apache/Dockerfile b/10.0/apache/Dockerfile index b7dbd85..d5122a0 100644 --- a/10.0/apache/Dockerfile +++ b/10.0/apache/Dockerfile @@ -35,7 +35,7 @@ RUN a2enmod rewrite RUN set -ex \ && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ - && pecl install redis-2.2.8 \ + && pecl install redis-3.1.1 \ && docker-php-ext-enable apcu redis memcached RUN a2enmod rewrite diff --git a/10.0/fpm/Dockerfile b/10.0/fpm/Dockerfile index e8fd32c..f6d076d 100644 --- a/10.0/fpm/Dockerfile +++ b/10.0/fpm/Dockerfile @@ -34,7 +34,7 @@ RUN { \ RUN set -ex \ && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ - && pecl install redis-2.2.8 \ + && pecl install redis-3.1.1 \ && docker-php-ext-enable apcu redis memcached ENV NEXTCLOUD_VERSION 10.0.3 diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile index a780008..bd43c39 100644 --- a/11.0/apache/Dockerfile +++ b/11.0/apache/Dockerfile @@ -35,7 +35,7 @@ RUN a2enmod rewrite RUN set -ex \ && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ - && pecl install redis-2.2.8 \ + && pecl install redis-3.1.1 \ && docker-php-ext-enable apcu redis memcached RUN a2enmod rewrite diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile index 670fe8f..f368d88 100644 --- a/11.0/fpm/Dockerfile +++ b/11.0/fpm/Dockerfile @@ -34,7 +34,7 @@ RUN { \ RUN set -ex \ && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ - && pecl install redis-2.2.8 \ + && pecl install redis-3.1.1 \ && docker-php-ext-enable apcu redis memcached ENV NEXTCLOUD_VERSION 11.0.1 diff --git a/9.0/apache/Dockerfile b/9.0/apache/Dockerfile index f4c2909..21bae75 100644 --- a/9.0/apache/Dockerfile +++ b/9.0/apache/Dockerfile @@ -35,7 +35,7 @@ RUN a2enmod rewrite RUN set -ex \ && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ - && pecl install redis-2.2.8 \ + && pecl install redis-3.1.1 \ && docker-php-ext-enable apcu redis memcached RUN a2enmod rewrite diff --git a/9.0/fpm/Dockerfile b/9.0/fpm/Dockerfile index c0e7683..cbfef69 100644 --- a/9.0/fpm/Dockerfile +++ b/9.0/fpm/Dockerfile @@ -34,7 +34,7 @@ RUN { \ RUN set -ex \ && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ - && pecl install redis-2.2.8 \ + && pecl install redis-3.1.1 \ && docker-php-ext-enable apcu redis memcached ENV NEXTCLOUD_VERSION 9.0.56 diff --git a/Dockerfile.template b/Dockerfile.template index a796225..6dd989a 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -35,7 +35,7 @@ RUN a2enmod rewrite RUN set -ex \ && pecl install APCu-5.1.8 \ && pecl install memcached-3.0.2 \ - && pecl install redis-2.2.8 \ + && pecl install redis-3.1.1 \ && docker-php-ext-enable apcu redis memcached RUN a2enmod rewrite