Merge commits from fork (#4)

* changed Dockerfile

using directly /var/www did not work. So I'm copying now during startup

* versuch

* versuch

* upgrade Version 3.0.4

* adding geoip

* adding geoip

Author: auchri

Dockerfile

@@ -2,8 +2,8 @@ FROM richarvey/nginx-php-fpm
 
 MAINTAINER auchri <auer.chrisi@gmx.net>
 
-ARG PIWIK_VERSION=3.0.2
-ARG GEOIP_PATH=/var/www/html/misc/
+ARG PIWIK_VERSION=3.0.4
+ARG GEOIP_PATH=/usr/src/misc/
 ARG GEOIP_FILE=${GEOIP_PATH}GeoIPCity.dat
 ARG GEOIP_FILE_NAME_GZ=GeoLiteCity.dat.gz
 
@@ -12,7 +12,7 @@ RUN apk add --no-cache bash \
 
 ADD robots.txt /var/www/html/robots.txt
 
-RUN cd /var/www/html && \
+RUN cd /usr/src/ && \
     wget https://builds.piwik.org/piwik-${PIWIK_VERSION}.tar.gz && \
     tar -xzf piwik-${PIWIK_VERSION}.tar.gz && \
     rm piwik-${PIWIK_VERSION}.tar.gz && \
@@ -21,13 +21,14 @@ RUN cd /var/www/html && \
     chown -Rf nginx:nginx . && \
     chmod -Rf 0755 .
 
-RUN sed -i -e 's/;always_populate_raw_post_data = -1/always_populate_raw_post_data = -1/g' /etc/php5/php.ini
-RUN sed -i -e 's/;always_populate_raw_post_data = -1/always_populate_raw_post_data = -1/g' /etc/php5/conf.d/php.ini
-
 RUN mkdir -p ${GEOIP_PATH} && \
     wget https://geolite.maxmind.com/download/geoip/database/${GEOIP_FILE_NAME_GZ} && \
     gunzip -c ${GEOIP_FILE_NAME_GZ} > ${GEOIP_FILE} && \
     chown -R nginx:nginx ${GEOIP_PATH} && \
     rm -f ${GEOIP_FILE_NAME_GZ}
+RUN cd /usr/src && \
+    rm -rf php.tar.xz php.tar.xz.asc
 
-EXPOSE 443 80
+VOLUME /var/www/html
+CMD cp -r /usr/src/* /var/www/html/ && /start.sh
+EXPOSE 80