Merge branch 'release-3.8.0' into stable

Author: BertrandGouny

Diff for: 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.8.0] - 2019-01-22
+### Changed
+  - Matomo 3.8.0
+
 ## [3.7.0] - 2018-11-29
 ### Changed
   - Matomo 3.7.0
@@ -84,6 +88,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## 2.16.2 - 2016-09-24
 Initial release
 
+[3.8.0]: https://github.com/osixia/docker-matomo/compare/v3.8.0...v3.8.0
 [3.7.0]: https://github.com/osixia/docker-matomo/compare/v3.6.1...v3.7.0
 [3.6.1]: https://github.com/osixia/docker-matomo/compare/v3.6.0...v3.6.1
 [3.6.0]: https://github.com/osixia/docker-matomo/compare/v3.5.1...v3.6.0

Diff for: Makefile

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

Diff for: README.md

@@ -6,7 +6,7 @@
 
 [hub]: https://hub.docker.com/r/osixia/matomo/
 
-Latest release: 3.7.0 - Matomo 3.7.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/matomo/) 
+Latest release: 3.8.0 - Matomo 3.8.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)

Diff for: image/Dockerfile

@@ -1,7 +1,7 @@
 FROM osixia/web-baseimage:1.1.1
 
 # Matomo version
-ARG MATOMO_VERSION=3.7.0
+ARG MATOMO_VERSION=3.8.0
 
 # MariaDB version
 ARG MARIADB_MAJOR=10.3
@@ -11,7 +11,7 @@ ARG MARIADB_MAJOR=10.3
 # php7.0-fpm install will detect apache2 and configure it
 
 # Add MariaDB repository
-RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 \
+RUN apt-key adv --no-tty --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: *'; \
@@ -41,8 +41,8 @@ RUN apt-get update \
   && 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 \
+  && curl -fsSL -o /var/www/matomo_bootstrap/misc/GeoLite2-City.tar.gz https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz \
+  && gunzip /var/www/matomo_bootstrap/misc/GeoLite2-City.tar.gz \
   && apt-get remove -y --purge --auto-remove curl \
   && rm matomo.tar.gz \
   && apt-get clean \