From dcca06de1580b10c8709160bed37639693439711 Mon Sep 17 00:00:00 2001 From: "Exploit.cz" Date: Wed, 6 Dec 2017 21:07:15 +0100 Subject: [PATCH] php 7.2 --- Dockerfile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index a821b21..6367881 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,12 @@ FROM phpearth/php:7.2-nginx MAINTAINER piwik@exploit.cz -ENV PHP_INI_DIR /etc/php/7.1 +ENV PHP_INI_DIR /etc/php/7.2 RUN mkdir -p $PHP_INI_DIR/conf.d && rm /etc/nginx/conf.d/default.conf -RUN apk add --no-cache bash php7.1-gd php7.1-mbstring php7.1-intl php7.1-pdo_mysql make gnupg geoip-dev composer php7.1-apcu +RUN apk add --no-cache bash php7.2-gd php7.2-mbstring php7.2-intl php7.2-pdo_mysql make gnupg geoip-dev composer php7.2-apcu -RUN apk add --no-cache --virtual .build-deps php7.1-dev gcc g++ \ +RUN apk add --no-cache --virtual .build-deps php7.2-dev gcc g++ \ && pecl install geoip-1.1.1 \ && rm -rf /tmp/* /var/cache/apk/* \ && apk del .build-deps @@ -27,18 +27,18 @@ RUN curl -fsSL -o piwik.tar.gz \ && tar -xzf piwik.tar.gz -C /var/www/html \ && rm -f piwik.tar.gz 2>&1 -COPY php.ini /etc/php/7.1/conf.d/php.ini - -RUN sed -i -e "s/;catch_workers_output\s*=\s*yes/catch_workers_output = yes/g" /etc/php/7.1/php-fpm.d/www.conf && \ - sed -i -e "s/;pm.status_path = \/status/pm.status_path = \/status/g" /etc/php/7.1/php-fpm.d/www.conf && \ - sed -i -e "s/;ping.path = \/ping/ping.path = \/ping/g" /etc/php/7.1/php-fpm.d/www.conf && \ - sed -i -e "s/;clear_env = no/clear_env = no/g" /etc/php/7.1/php-fpm.d/www.conf && \ - sed -i -e "s/;ping.response = pong/ping.response = pong/g" /etc/php/7.1/php-fpm.d/www.conf - #sed -i -e "s/pm.max_children = 5/pm.max_children = 9/g" /etc/php/7.1/php-fpm.d/www.conf && \ - #sed -i -e "s/pm.start_servers = 2/pm.start_servers = 3/g" /etc/php/7.1/php-fpm.d/www.conf && \ - #sed -i -e "s/pm.min_spare_servers = 1/pm.min_spare_servers = 2/g" /etc/php/7.1/php-fpm.d/www.conf && \ - #sed -i -e "s/pm.max_spare_servers = 3/pm.max_spare_servers = 4/g" /etc/php/7.1/php-fpm.d/www.conf && \ - #sed -i -e "s/pm.max_requests = 500/pm.max_requests = 1000/g" /etc/php/7.1/php-fpm.d/www.conf +COPY php.ini /etc/php/7.2/conf.d/php.ini + +RUN sed -i -e "s/;catch_workers_output\s*=\s*yes/catch_workers_output = yes/g" /etc/php/7.2/php-fpm.d/www.conf && \ + sed -i -e "s/;pm.status_path = \/status/pm.status_path = \/status/g" /etc/php/7.2/php-fpm.d/www.conf && \ + sed -i -e "s/;ping.path = \/ping/ping.path = \/ping/g" /etc/php/7.2/php-fpm.d/www.conf && \ + sed -i -e "s/;clear_env = no/clear_env = no/g" /etc/php/7.2/php-fpm.d/www.conf && \ + sed -i -e "s/;ping.response = pong/ping.response = pong/g" /etc/php/7.2/php-fpm.d/www.conf + #sed -i -e "s/pm.max_children = 5/pm.max_children = 9/g" /etc/php/7.2/php-fpm.d/www.conf && \ + #sed -i -e "s/pm.start_servers = 2/pm.start_servers = 3/g" /etc/php/7.2/php-fpm.d/www.conf && \ + #sed -i -e "s/pm.min_spare_servers = 1/pm.min_spare_servers = 2/g" /etc/php/7.2/php-fpm.d/www.conf && \ + #sed -i -e "s/pm.max_spare_servers = 3/pm.max_spare_servers = 4/g" /etc/php/7.2/php-fpm.d/www.conf && \ + #sed -i -e "s/pm.max_requests = 500/pm.max_requests = 1000/g" /etc/php/7.2/php-fpm.d/www.conf RUN mkdir -p /usr/local/share/GeoIP && curl -fsSL -o /usr/local/share/GeoIP/GeoIPCity.dat.gz https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz \ && gunzip /usr/local/share/GeoIP/GeoIPCity.dat.gz