From 56cd1012458ac99360d62c36718e81898213e5dc Mon Sep 17 00:00:00 2001
From: Wonderfall <wonderfall@schrodinger.io>
Date: Sun, 1 May 2016 16:29:24 +0200
Subject: [PATCH] piwik: update to php 7

---
 piwik/Dockerfile       | 52 +++++++++++++++++++++++++-----------------
 piwik/supervisord.conf |  2 +-
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/piwik/Dockerfile b/piwik/Dockerfile
index 4e78d97..0d5f0dc 100644
--- a/piwik/Dockerfile
+++ b/piwik/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.3
+FROM alpine:edge
 MAINTAINER Wonderfall <wonderfall@mondedie.fr>
 
 ARG VERSION=2.16.1
@@ -9,33 +9,42 @@ RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/re
  && echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
  && apk -U add \
     nginx \
-    php-fpm \
-    php-gd \
-    php-curl \
-    php-cli \
-    php-json \
-    php-ctype \
-    php-iconv \
-    php-zlib \
-    php-dom \
-    php-openssl \
-    php-geoip@testing \
-    php-mysqli \
-    php-pdo_mysql \
     supervisor \
+    libwebp \
+    git \
+    autoconf \
+    build-base \
+    geoip \
+    geoip-dev \
     tini@commuedge \
- && sed -i 's/;always_populate_raw_post_data/always_populate_raw_post_data/g' /etc/php/php.ini \
- && echo 'geoip.custom_directory=/piwik/misc' >> /etc/php/php.ini \
- && rm -f /var/cache/apk/*
+    php7-fpm@testing \
+    php7-gd@testing \
+    php7-curl@testing \
+    php7-session@testing \
+    php7-json@testing \
+    php7-ctype@testing \
+    php7-mbstring@testing \
+    php7-iconv@testing \
+    php7-zlib@testing \
+    php7-dom@testing \
+    php7-openssl@testing \
+    php7-mysqli@testing \
+    php7-pdo_mysql@testing \
+    php7-dev@testing \
+    php7-pear@testing \
+ && cd /tmp && git clone https://github.com/Zakay/geoip && cd geoip \
+ && phpize7 && ./configure --with-php-config=/usr/bin/php-config7 && make && make install \
+ && echo 'geoip.custom_directory=/piwik/misc' >> /etc/php7/php.ini \
+ && apk del git autoconf build-base php7-dev php7-pear geoip-dev \
+ && rm -rf /var/cache/apk/* /tmp/*
 
-RUN wget -qO- http://builds.piwik.org/piwik-$VERSION.tar.gz | tar xz
-
-RUN wget -q http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz -P /piwik/misc \
+RUN wget -qO- http://builds.piwik.org/piwik-$VERSION.tar.gz | tar xz \
+ && wget -q http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz -P /piwik/misc \
  && gzip -d /piwik/misc/GeoLiteCity.dat.gz \
  && mv /piwik/misc/GeoLiteCity.dat /piwik/misc/GeoIPCity.dat
 
 COPY nginx.conf /etc/nginx/nginx.conf
-COPY php-fpm.conf /etc/php/php-fpm.conf
+COPY php-fpm.conf /etc/php7/php-fpm.conf
 COPY supervisord.conf /usr/local/etc/supervisord.conf
 COPY run.sh /usr/local/bin/run.sh
 
@@ -48,3 +57,4 @@ LABEL description "Open web analytics platform" \
       piwik "Piwik v$VERSION"
       
 CMD ["tini","--","run.sh"]
+
diff --git a/piwik/supervisord.conf b/piwik/supervisord.conf
index 61657fa..f2cd4b1 100644
--- a/piwik/supervisord.conf
+++ b/piwik/supervisord.conf
@@ -2,7 +2,7 @@
 nodaemon=true
 
 [program:php-fpm]
-command=php-fpm
+command=php-fpm7
 
 [program:nginx]
 command=nginx