From 19da4021dd5e1e7e562992ade619512e2fcfca02 Mon Sep 17 00:00:00 2001
From: Wonderfall <wonderfall@schrodinger.io>
Date: Fri, 3 Mar 2017 14:01:49 +0100
Subject: [PATCH] piwik: update to PHP 7.1

---
 piwik/Dockerfile   | 40 ++++++++++++++++++++--------------------
 piwik/run.sh       |  2 +-
 piwik/s6.d/php/run |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/piwik/Dockerfile b/piwik/Dockerfile
index e1ceab0..8517a7a 100644
--- a/piwik/Dockerfile
+++ b/piwik/Dockerfile
@@ -5,7 +5,7 @@ ARG GPG_matthieu="814E 346F A01A 20DB B04B  6807 B5DB D592 5590 A237"
 
 ENV UID=991 GID=991
 
-RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && BUILD_DEPS=" \
     git \
     tar \
@@ -22,24 +22,24 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
     su-exec \
     geoip \
     tzdata \
-    php7-fpm@commuedge \
-    php7-gd@commuedge \
-    php7-curl@commuedge \
-    php7-session@commuedge \
-    php7-json@commuedge \
-    php7-ctype@commuedge \
-    php7-mbstring@commuedge \
-    php7-iconv@commuedge \
-    php7-zlib@commuedge \
-    php7-dom@commuedge \
-    php7-openssl@commuedge \
-    php7-mysqli@commuedge \
-    php7-pdo_mysql@commuedge \
-    php7-dev@commuedge \
-    php7-pear@commuedge \
+    php7.1-fpm@testing \
+    php7.1-gd@testing \
+    php7.1-curl@testing \
+    php7.1-session@testing \
+    php7.1-json@testing \
+    php7.1-ctype@testing \
+    php7.1-mbstring@testing \
+    php7.1-iconv@testing \
+    php7.1-zlib@testing \
+    php7.1-dom@testing \
+    php7.1-openssl@testing \
+    php7.1-mysqli@testing \
+    php7.1-pdo_mysql@testing \
+    php7.1-dev@testing \
+    php7.1-pear@testing \
  && sed -i "$ s|\-n||g" /usr/bin/pecl && pecl install geoip-1.1.1 \
- && echo 'extension=geoip.so' >> /etc/php7/conf.d/00_geoip.ini \
- && echo 'geoip.custom_directory=/piwik/misc' >> /etc/php7/php.ini \
+ && echo 'extension=geoip.so' >> /etc/php7.1/conf.d/00_geoip.ini \
+ && echo 'geoip.custom_directory=/piwik/misc' >> /etc/php7.1/php.ini \
  && mkdir /piwik && cd /tmp \
  && PIWIK_TARBALL="piwik-${VERSION}.tar.gz" \
  && wget -q https://builds.piwik.org/${PIWIK_TARBALL} \
@@ -56,11 +56,11 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
  && wget -q https://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 \
- && apk del ${BUILD_DEPS} php7-dev php7-pear \
+ && apk del ${BUILD_DEPS} php7.1-dev php7.1-pear \
  && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
 
 COPY nginx.conf /etc/nginx/nginx.conf
-COPY php-fpm.conf /etc/php7/php-fpm.conf
+COPY php-fpm.conf /etc/php7.1/php-fpm.conf
 COPY s6.d /etc/s6.d
 COPY run.sh /usr/local/bin/run.sh
 
diff --git a/piwik/run.sh b/piwik/run.sh
index 8c3ae7b..25142f1 100644
--- a/piwik/run.sh
+++ b/piwik/run.sh
@@ -6,5 +6,5 @@ fi
 
 ln -s /config/config.ini.php /piwik/config/config.ini.php
 mv piwik fix && mv fix piwik # fix strange bug
-chown -R $UID:$GID /piwik /config /var/log /etc/nginx /etc/php7 /var/lib/nginx /tmp /etc/s6.d
+chown -R $UID:$GID /piwik /config /var/log /etc/nginx /etc/php7.1 /var/lib/nginx /tmp /etc/s6.d
 exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d
diff --git a/piwik/s6.d/php/run b/piwik/s6.d/php/run
index e238021..e0b458a 100644
--- a/piwik/s6.d/php/run
+++ b/piwik/s6.d/php/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec php-fpm7
+exec php-fpm7.1