From 20fdc50c1053423dafeac08ce8e0801041c64469 Mon Sep 17 00:00:00 2001 From: daper Date: Tue, 19 May 2015 12:02:54 +0200 Subject: [PATCH 1/2] Conflict with xcache Disabling xCache due to OPCache conflict --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2ae7bd3..c1109de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,8 @@ RUN sed -i "s/;date.timezone =.*/date.timezone = UTC/" /etc/php5/fpm/php.ini && sed -i '/^listen = /clisten = 9000' /etc/php5/fpm/pool.d/www.conf && \ sed -i '/^listen.allowed_clients/c;listen.allowed_clients =' /etc/php5/fpm/pool.d/www.conf && \ sed -i '/^;catch_workers_output/ccatch_workers_output = yes' /etc/php5/fpm/pool.d/www.conf && \ - sed -i '/^;env\[TEMP\] = .*/aenv[DB_PORT_3306_TCP_ADDR] = $DB_PORT_3306_TCP_ADDR' /etc/php5/fpm/pool.d/www.conf + sed -i '/^;env\[TEMP\] = .*/aenv[DB_PORT_3306_TCP_ADDR] = $DB_PORT_3306_TCP_ADDR' /etc/php5/fpm/pool.d/www.conf \ + sed -i "s/xcache.cacher = .*/xcache.cacher = Off/" /etc/php5/fpm/conf.d/20-xcache.ini RUN mkdir -p /data VOLUME ["/data"] From ca815ef76220c316f546b18be1b614702c6d056b Mon Sep 17 00:00:00 2001 From: daper Date: Tue, 19 May 2015 12:18:04 +0200 Subject: [PATCH 2/2] added && to the command --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c1109de..78d62ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ RUN sed -i "s/;date.timezone =.*/date.timezone = UTC/" /etc/php5/fpm/php.ini && sed -i '/^listen = /clisten = 9000' /etc/php5/fpm/pool.d/www.conf && \ sed -i '/^listen.allowed_clients/c;listen.allowed_clients =' /etc/php5/fpm/pool.d/www.conf && \ sed -i '/^;catch_workers_output/ccatch_workers_output = yes' /etc/php5/fpm/pool.d/www.conf && \ - sed -i '/^;env\[TEMP\] = .*/aenv[DB_PORT_3306_TCP_ADDR] = $DB_PORT_3306_TCP_ADDR' /etc/php5/fpm/pool.d/www.conf \ + sed -i '/^;env\[TEMP\] = .*/aenv[DB_PORT_3306_TCP_ADDR] = $DB_PORT_3306_TCP_ADDR' /etc/php5/fpm/pool.d/www.conf && \ sed -i "s/xcache.cacher = .*/xcache.cacher = Off/" /etc/php5/fpm/conf.d/20-xcache.ini RUN mkdir -p /data