Merge branch 'release-3.6.0' into stable

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.6.0] - 2018-09-05
+### Changed
+  - Matomo 3.6.0
+
 ## [3.5.1] - 2018-05-26
 ### Changed
   - Matomo 3.5.1

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/matomo
-VERSION = 3.5.1
+VERSION = 3.6.0
 
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 

README.md

@@ -6,7 +6,7 @@
 
 [hub]: https://hub.docker.com/r/osixia/matomo/
 
-Latest release: 3.5.1 - Matomo 3.5.1 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/matomo/) 
+Latest release: 3.6.0 - Matomo 3.6.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/matomo/) 
 
 **A docker image to run Matomo (formerly Piwik).**
 > [matomo.org](https://matomo.org)

image/Dockerfile

@@ -1,53 +1,52 @@
 FROM osixia/web-baseimage:1.1.1
-MAINTAINER Bertrand Gouny <[email protected]>
 
 # Matomo version
-ARG MATOMO_VERSION=3.5.1
+ARG MATOMO_VERSION=3.6.0
 
 # MariaDB version
-ARG MARIADB_MAJOR=10.2
+ARG MARIADB_MAJOR=10.3
 
 # Install apache2 and php7.0-fpm using osixia/baseimage utils
 # Caution: /container/tool/install-service-available arguments order is important
 # php7.0-fpm install will detect apache2 and configure it
 
 # Add MariaDB repository
 RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 \
-    && echo "deb http://ftp.igh.cnrs.fr/pub/mariadb/repo/$MARIADB_MAJOR/debian stretch main" > /etc/apt/sources.list.d/mariadb.list \
-    && { \
-		     echo 'Package: *'; \
-		     echo 'Pin: release o=MariaDB'; \
-		     echo 'Pin-Priority: 999'; \
-	     } > /etc/apt/preferences.d/mariadb
+  && echo "deb http://ftp.igh.cnrs.fr/pub/mariadb/repo/$MARIADB_MAJOR/debian stretch main" > /etc/apt/sources.list.d/mariadb.list \
+  && { \
+  echo 'Package: *'; \
+  echo 'Pin: release o=MariaDB'; \
+  echo 'Pin-Priority: 999'; \
+  } > /etc/apt/preferences.d/mariadb
 
 # Download, check integrity and unzip phpMyAdmin to /var/www/matomo_bootstrap
 RUN apt-get update \
-		&& /container/tool/add-multiple-process-stack \
-		&& /container/tool/add-service-available :apache2 :php7.0-fpm :ssl-tools \
-		&& LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-       ca-certificates \
-       curl \
-       mariadb-client-$MARIADB_MAJOR \
-       php7.0-cli \
-       php7.0-curl \
-       php7.0-gd \
-       php7.0-geoip \
-       php7.0-ldap \
-       php7.0-mbstring \
-       php7.0-mysql \
-       php7.0-xml \
-       ssmtp \
-       zip \
-		&& curl -o matomo.tar.gz -SL https://builds.matomo.org/piwik-${MATOMO_VERSION}.tar.gz \
-		&& mkdir -p /var/www/matomo_bootstrap /var/www/matomo \
-		&& tar -xzf matomo.tar.gz --strip 1 -C /var/www/matomo_bootstrap \
-    && echo "${MATOMO_VERSION}" > /var/www/matomo_bootstrap/VERSION \
-    && curl -fsSL -o /var/www/matomo_bootstrap/misc/GeoIPCity.dat.gz https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz \
-    && gunzip /var/www/matomo_bootstrap/misc/GeoIPCity.dat.gz \
-		&& apt-get remove -y --purge --auto-remove curl \
-    && rm matomo.tar.gz \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+  && /container/tool/add-multiple-process-stack \
+  && /container/tool/add-service-available :apache2 :php7.0-fpm :ssl-tools \
+  && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+  ca-certificates \
+  curl \
+  mariadb-client-$MARIADB_MAJOR \
+  php7.0-cli \
+  php7.0-curl \
+  php7.0-gd \
+  php7.0-geoip \
+  php7.0-ldap \
+  php7.0-mbstring \
+  php7.0-mysql \
+  php7.0-xml \
+  ssmtp \
+  zip \
+  && curl -o matomo.tar.gz -SL https://builds.matomo.org/piwik-${MATOMO_VERSION}.tar.gz \
+  && mkdir -p /var/www/matomo_bootstrap /var/www/matomo \
+  && tar -xzf matomo.tar.gz --strip 1 -C /var/www/matomo_bootstrap \
+  && echo "${MATOMO_VERSION}" > /var/www/matomo_bootstrap/VERSION \
+  && curl -fsSL -o /var/www/matomo_bootstrap/misc/GeoIPCity.dat.gz https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz \
+  && gunzip /var/www/matomo_bootstrap/misc/GeoIPCity.dat.gz \
+  && apt-get remove -y --purge --auto-remove curl \
+  && rm matomo.tar.gz \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Add service directory to /container/service
 ADD service /container/service