Merge branch 'release-3.5.0' into stable

CHANGELOG.md

@@ -4,6 +4,13 @@ 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.5.0] - 2018-05-16
+### Added
+  - MariaDB ssl
+
+### Changed
+  - Matomo 3.5.0 (formerly Piwik)
+
 ## [3.4.0] - 2018-03-28
 ### Changed
   - Matomo 3.4.0 (formerly Piwik)
@@ -61,13 +68,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## 2.16.2 - 2016-09-24
 Initial release
 
-[3.4.0]: https://github.com/osixia/docker-mariadb/compare/v3.3.0...v3.4.0
-[3.3.0]: https://github.com/osixia/docker-mariadb/compare/v3.2.1...v3.3.0
-[3.2.1]: https://github.com/osixia/docker-mariadb/compare/v3.2.0...v3.2.1
-[3.2.0]: https://github.com/osixia/docker-mariadb/compare/v3.1.1...v3.2.0
-[3.1.1]: https://github.com/osixia/docker-mariadb/compare/v3.1.0...v3.1.1
-[3.1.0]: https://github.com/osixia/docker-mariadb/compare/v3.0.4...v3.1.0
-[3.0.4]: https://github.com/osixia/docker-mariadb/compare/v2.17.1...v3.0.4
-[2.17.1]: https://github.com/osixia/docker-mariadb/compare/v2.17.0...v2.17.1
-[2.17.0]: https://github.com/osixia/docker-mariadb/compare/v2.16.5...v2.17.0
-[2.16.5]: https://github.com/osixia/docker-mariadb/compare/v2.16.2...v2.16.5
+[3.5.0]: https://github.com/osixia/docker-matomo/compare/v3.4.0...v3.5.0
+[3.4.0]: https://github.com/osixia/docker-matomo/compare/v3.3.0...v3.4.0
+[3.3.0]: https://github.com/osixia/docker-matomo/compare/v3.2.1...v3.3.0
+[3.2.1]: https://github.com/osixia/docker-matomo/compare/v3.2.0...v3.2.1
+[3.2.0]: https://github.com/osixia/docker-matomo/compare/v3.1.1...v3.2.0
+[3.1.1]: https://github.com/osixia/docker-matomo/compare/v3.1.0...v3.1.1
+[3.1.0]: https://github.com/osixia/docker-matomo/compare/v3.0.4...v3.1.0
+[3.0.4]: https://github.com/osixia/docker-matomo/compare/v2.17.1...v3.0.4
+[2.17.1]: https://github.com/osixia/docker-matomo/compare/v2.17.0...v2.17.1
+[2.17.0]: https://github.com/osixia/docker-matomo/compare/v2.16.5...v2.17.0
+[2.16.5]: https://github.com/osixia/docker-matomo/compare/v2.16.2...v2.16.5

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/matomo
-VERSION = 3.4.0
+VERSION = 3.5.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.4.0 - Matomo 3.4.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/matomo/) 
+Latest release: 3.5.0 - Matomo 3.5.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

@@ -2,7 +2,7 @@ FROM osixia/web-baseimage:1.1.1
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # Matomo version
-ARG MATOMO_VERSION=3.4.0
+ARG MATOMO_VERSION=3.5.0
 
 # MariaDB version
 ARG MARIADB_MAJOR=10.2

image/environment/default.yaml

@@ -28,7 +28,14 @@ MATOMO_LDAP_CLIENT_TLS_CA_CRT_FILENAME: ldap-ca.crt
 MATOMO_LDAP_CLIENT_TLS_CRT_FILENAME: ldap-client.crt
 MATOMO_LDAP_CLIENT_TLS_KEY_FILENAME: ldap-client.key
 
+# MARIADB client tls config
+MATOMO_MARIADB_CLIENT_TLS: false
+MATOMO_MARIADB_CLIENT_TLS_CA_CRT_FILENAME: database-ca.crt
+MATOMO_MARIADB_CLIENT_TLS_CRT_FILENAME: database-client.crt
+MATOMO_MARIADB_CLIENT_TLS_KEY_FILENAME: database-client.key
+
 MATOMO_SSL_HELPER_PREFIX: matomo
 LDAP_CLIENT_SSL_HELPER_PREFIX: ldap
+MARIADB_CLIENT_SSL_HELPER_PREFIX: database
 
 SSL_HELPER_AUTO_RENEW_SERVICES_IMPACTED: :apache2 :php7.0-fpm

image/service/mariadb-client/assets/certs/README.md

@@ -0,0 +1,2 @@
+Add your mariadb client certificate, key and CA certificate here
+or during docker run mount a data volume with those files to /container/service/mariadb-client/assets/certs

image/service/mariadb-client/startup.sh

@@ -0,0 +1,22 @@
+#!/bin/bash -e
+
+# set -x (bash debug) if log level is trace
+# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/log-helper
+log-helper level eq trace && set -x
+
+FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-mariadb-client-first-start-done"
+# container first start
+if [ ! -e "$FIRST_START_DONE" ]; then
+
+  if [ "${MATOMO_MARIADB_CLIENT_TLS,,}" == "true" ]; then
+    # generate a certificate and key if files don't exists
+    # https://github.com/osixia/docker-light-baseimage/blob/stable/image/service-available/:ssl-tools/assets/tool/ssl-helper
+    ssl-helper ${MARIADB_CLIENT_SSL_HELPER_PREFIX} "${CONTAINER_SERVICE_DIR}/mariadb-client/assets/certs/$MATOMO_MARIADB_CLIENT_TLS_CRT_FILENAME" "${CONTAINER_SERVICE_DIR}/mariadb-client/assets/certs/$MATOMO_MARIADB_CLIENT_TLS_KEY_FILENAME" "${CONTAINER_SERVICE_DIR}/mariadb-client/assets/certs/$MATOMO_MARIADB_CLIENT_TLS_CA_CRT_FILENAME"
+
+    chown www-data:www-data -R ${CONTAINER_SERVICE_DIR}/mariadb-client/assets/certs/
+  fi
+
+  touch $FIRST_START_DONE
+fi
+
+exit 0