From 710385f29b07cf9da1ff1e5a65ffb439101603dc Mon Sep 17 00:00:00 2001 From: Marco Pfeiffer Date: Wed, 3 May 2017 09:21:41 +0200 Subject: [PATCH 1/3] installed opcache in php 7 --- 7.0/Dockerfile | 2 +- 7.0/apache/Dockerfile | 2 +- 7.0/fpm/Dockerfile | 2 +- 7.1/Dockerfile | 2 +- 7.1/apache/Dockerfile | 2 +- 7.1/fpm/Dockerfile | 2 +- Dockerfile | 2 +- Makefile | 5 +++++ 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/7.0/Dockerfile b/7.0/Dockerfile index 7e176ca..d07d61e 100644 --- a/7.0/Dockerfile +++ b/7.0/Dockerfile @@ -17,7 +17,7 @@ RUN buildDeps=" \ libpq-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install redis \ diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index dfda266..c8df581 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -17,7 +17,7 @@ RUN buildDeps=" \ libpq-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install redis \ diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile index a3fb8c9..ecc4933 100644 --- a/7.0/fpm/Dockerfile +++ b/7.0/fpm/Dockerfile @@ -17,7 +17,7 @@ RUN buildDeps=" \ libpq-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install redis \ diff --git a/7.1/Dockerfile b/7.1/Dockerfile index aa97653..50c255b 100644 --- a/7.1/Dockerfile +++ b/7.1/Dockerfile @@ -17,7 +17,7 @@ RUN buildDeps=" \ libpq-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install redis \ diff --git a/7.1/apache/Dockerfile b/7.1/apache/Dockerfile index e8874d6..fcfc01a 100644 --- a/7.1/apache/Dockerfile +++ b/7.1/apache/Dockerfile @@ -17,7 +17,7 @@ RUN buildDeps=" \ libpq-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install redis \ diff --git a/7.1/fpm/Dockerfile b/7.1/fpm/Dockerfile index 23483a0..dbc8eda 100644 --- a/7.1/fpm/Dockerfile +++ b/7.1/fpm/Dockerfile @@ -17,7 +17,7 @@ RUN buildDeps=" \ libpq-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install redis \ diff --git a/Dockerfile b/Dockerfile index 85f644d..d66798e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN buildDeps=" \ libpq-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install redis \ diff --git a/Makefile b/Makefile index 7a671d8..a09661d 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,11 @@ ifneq ($(VERSION),$(filter 7.0 7.1 latest, $(VERSION))) EXTENSIONS += memcached mysql endif +ifeq ($(VERSION),$(filter 7.0 7.1 latest, $(VERSION))) + # Add more extensions to 7.x series images. + EXTENSIONS += OPcache +endif + pull: @for tag in $(TAGS); do \ docker pull $(PARENT_IMAGE):$${tag}; \ From db6ed745ac0a4f0737f1db75f8bbdd1e7c1db5e8 Mon Sep 17 00:00:00 2001 From: Marco Pfeiffer Date: Thu, 4 May 2017 09:22:25 +0200 Subject: [PATCH 2/3] add opcache to php 5.5 and 5.6 --- 5.5/Dockerfile | 2 +- 5.5/apache/Dockerfile | 2 +- 5.5/fpm/Dockerfile | 2 +- 5.6/Dockerfile | 2 +- 5.6/apache/Dockerfile | 2 +- 5.6/fpm/Dockerfile | 2 +- Makefile | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/5.5/Dockerfile b/5.5/Dockerfile index d1c2ac0..121c0ef 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -21,7 +21,7 @@ RUN buildDeps=" \ php-pear \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install memcached redis \ diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index 7d7f2b0..c6bc671 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -20,7 +20,7 @@ RUN buildDeps=" \ libpq-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install memcached redis \ diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile index 41394e7..16c8085 100644 --- a/5.5/fpm/Dockerfile +++ b/5.5/fpm/Dockerfile @@ -20,7 +20,7 @@ RUN buildDeps=" \ libpq-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install memcached redis \ diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 03452ca..b7cc723 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -21,7 +21,7 @@ RUN buildDeps=" \ php-pear \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install memcached redis \ diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index c38e7f3..cc084e6 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -20,7 +20,7 @@ RUN buildDeps=" \ libpq-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install memcached redis \ diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index f4ca396..9bea019 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -20,7 +20,7 @@ RUN buildDeps=" \ libpq-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql zip \ + && docker-php-ext-install bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql zip \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && pecl install memcached redis \ diff --git a/Makefile b/Makefile index a09661d..8afea25 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,8 @@ ifneq ($(VERSION),$(filter 7.0 7.1 latest, $(VERSION))) EXTENSIONS += memcached mysql endif -ifeq ($(VERSION),$(filter 7.0 7.1 latest, $(VERSION))) - # Add more extensions to 7.x series images. +# add opcache check to php version with zend opcache +ifeq ($(VERSION),$(filter 5.5 5.6 7.0 7.1 latest, $(VERSION))) EXTENSIONS += OPcache endif From 5d472338343f6a141093e95af13049e4f24dacb1 Mon Sep 17 00:00:00 2001 From: Marco Pfeiffer Date: Thu, 4 May 2017 10:48:14 +0200 Subject: [PATCH 3/3] copied test for dev version --- dev/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dev/Makefile b/dev/Makefile index aa9c414..23f8547 100644 --- a/dev/Makefile +++ b/dev/Makefile @@ -33,6 +33,11 @@ ifneq ($(VERSION),$(filter 7.0 7.1 latest, $(VERSION))) EXTENSIONS += memcached mysql endif +# add opcache check to php version with zend opcache +ifeq ($(VERSION),$(filter 5.5 5.6 7.0 7.1 latest, $(VERSION))) + EXTENSIONS += OPcache +endif + pull: @for tag in $(TAGS); do \ docker pull $(PARENT_IMAGE):$${tag}; \