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 43565093..55ce3a06 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 1a365e6e..73b8510f 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 d645d8b8..77267e9e 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 35c12645..0f2bba58 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 3fead994..8015abae 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 9d41eaf7..15d21eea 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 3d713793..c3198345 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 55ce3a06..a3bafedf 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 73b8510f..9a4a388f 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 77267e9e..e41c5d26 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 0f2bba58..7b1a35ad 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 8015abae..ce5f1bc3 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 15d21eea..83c8b70d 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 c3198345..1b577c4a 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 a3bafedf..0135c4b7 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 9a4a388f..cbf91e5e 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 e41c5d26..3b6ba641 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 7b1a35ad..bf9ab186 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 ce5f1bc3..5579b8c8 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 83c8b70d..16fa5240 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 1b577c4a..94d1eabe 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 0135c4b7..b7dbd850 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 cbf91e5e..e8fd32c0 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 3b6ba641..a7800088 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 bf9ab186..670fe8f5 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 5579b8c8..f4c29098 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 16fa5240..c0e76831 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 94d1eabe..a7962250 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 b7dbd850..d5122a0d 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 e8fd32c0..f6d076d3 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 a7800088..bd43c398 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 670fe8f5..f368d882 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 f4c29098..21bae75a 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 c0e76831..cbfef696 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 a7962250..6dd989a5 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