3.3.0-r4 release

Matomo expects an existing database to be configured with.

bitnami/matomo/3/Dockerfile

@@ -4,27 +4,35 @@ LABEL maintainer "Bitnami <containers@bitnami.com>"
 # Install required system packages and dependencies
 RUN install_packages libapr1 libaprutil1 libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls-deb0-28 libgpg-error0 libgssapi-krb5-2 libhogweed2 libicu52 libidn11 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libncurses5 libnettle4 libp11-kit0 libpcre3 libpng12-0 libpq5 libreadline6 librtmp1 libsasl2-2 libssh2-1 libssl1.0.0 libstdc++6 libsybdb5 libtasn1-6 libtidy-0.99-0 libtinfo5 libuuid1 libxml2 libxslt1.1 zlib1g
 RUN bitnami-pkg unpack apache-2.4.29-1 --checksum 42114e87aafb1d519ab33451b6836873bca125d78ce7423c5f7f1de4a7198596
-RUN bitnami-pkg unpack php-7.0.28-0 --checksum 998f187961dd91ad14bd08e692559a8e1f59441f634256554dfcc1ddcbbd8209
-RUN bitnami-pkg install mysql-client-10.1.31-0 --checksum c5140f9fd386782201b78559972045018928a405df324564deb392c6c61073c1
+RUN bitnami-pkg unpack php-7.0.28-1 --checksum 211499a3c674c8cf5d338764b2ea4ac312a5edbd49df928448927cacb9632634
+RUN bitnami-pkg unpack mysql-client-10.1.31-0 --checksum c5140f9fd386782201b78559972045018928a405df324564deb392c6c61073c1
 RUN bitnami-pkg install libphp-7.0.28-0 --checksum a9d64e3bf9dd634710c8a9020735efa8f1bff6a6ffbb6b1f048d5d6cc9dccfc6
-RUN bitnami-pkg unpack matomo-3.3.0-1 --checksum a7b3272c6fbb47c78229d9bb80925bfc52e475ab2241dc3dd33f9ebe01c357b2
+RUN bitnami-pkg unpack matomo-3.3.0-2 --checksum 59841f4098418cc0830e208bfe0e4fdb8689928f54d7be0f143e15ed6584f2cf
 
 COPY rootfs /
 
-ENV APACHE_HTTPS_PORT_NUMBER="443" \
+ENV ALLOW_EMPTY_PASSWORD="no" \
+    APACHE_HTTPS_PORT_NUMBER="443" \
     APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="matomo" \
-    BITNAMI_IMAGE_VERSION="3.3.0-r3" \
+    BITNAMI_IMAGE_VERSION="3.3.0-r4" \
     MARIADB_HOST="mariadb" \
-    MARIADB_PASSWORD="" \
     MARIADB_PORT_NUMBER="3306" \
-    MARIADB_USER="root" \
+    MARIADB_ROOT_PASSWORD="" \
+    MARIADB_ROOT_USER="root" \
+    MATOMO_DATABASE_NAME="bitnami_matomo" \
+    MATOMO_DATABASE_PASSWORD="" \
+    MATOMO_DATABASE_USER="bn_matomo" \
     MATOMO_EMAIL="user@example.com" \
     MATOMO_HOST="127.0.0.1" \
     MATOMO_PASSWORD="bitnami" \
     MATOMO_USERNAME="User" \
     MATOMO_WEBSITE_HOST="https://example.org" \
     MATOM_WEBSITE_NAME="example" \
+    MYSQL_CLIENT_CREATE_DATABASE_NAME="" \
+    MYSQL_CLIENT_CREATE_DATABASE_PASSWORD="" \
+    MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES="ALL" \
+    MYSQL_CLIENT_CREATE_DATABASE_USER="" \
     PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:/opt/bitnami/mysql/bin:$PATH" \
     SMTP_HOST="" \
     SMTP_PASSWORD="" \

bitnami/matomo/3/docker-compose.yml

@@ -3,11 +3,19 @@ services:
   mariadb:
     image: 'bitnami/mariadb:latest'
     environment:
+      - MARIADB_USER=bn_matomo
+      - MARIADB_DATABASE=bitnami_matomo
       - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'mariadb_data:/bitnami'
   matomo:
     image: 'bitnami/matomo:3'
+    environment:
+      - MARIADB_HOST=mariadb
+      - MARIADB_PORT_NUMBER=3306
+      - WORDPRESS_DATABASE_USER=bn_matomo
+      - WORDPRESS_DATABASE_NAME=bitnami_matomo
+      - ALLOW_EMPTY_PASSWORD=yes
     labels:
       kompose.service.type: nodeport
     ports:

bitnami/matomo/3/rootfs/app-entrypoint.sh

@@ -6,7 +6,7 @@
 print_welcome_page
 
 if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
-  nami_initialize apache php matomo
+  nami_initialize apache php mysql-client matomo
   info "Starting matomo... "
 fi
 

bitnami/matomo/3/rootfs/matomo-inputs.json

@@ -1,8 +1,9 @@
 {
-  "databaseAdminPassword": "{{$global.env.MARIADB_PASSWORD}}",
-  "databaseAdminUser": "{{$global.env.MARIADB_USER}}",
+  "databaseName": "{{$global.env.MATOMO_DATABASE_NAME}}",
+  "databasePassword": "{{$global.env.MATOMO_DATABASE_PASSWORD}}",
   "databaseServerHost": "{{$global.env.MARIADB_HOST}}",
   "databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}",
+  "databaseUser": "{{$global.env.MATOMO_DATABASE_USER}}",
   "email": "{{$global.env.MATOMO_EMAIL}}",
   "host": "{{$global.env.MATOMO_HOST}}",
   "password": "{{$global.env.MATOMO_PASSWORD}}",

bitnami/matomo/3/rootfs/mysql-client-inputs.json

@@ -0,0 +1,11 @@
+{
+  "allowEmptyPassword": "{{$global.env.ALLOW_EMPTY_PASSWORD}}",
+  "createDatabaseName": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_NAME}}",
+  "createDatabasePassword": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PASSWORD}}",
+  "createDatabasePrivileges": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES}}",
+  "createDatabaseUser": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_USER}}",
+  "host": "{{$global.env.MARIADB_HOST}}",
+  "port": "{{$global.env.MARIADB_PORT_NUMBER}}",
+  "rootPassword": "{{$global.env.MARIADB_ROOT_PASSWORD}}",
+  "rootUser": "{{$global.env.MARIADB_ROOT_USER}}"
+}

bitnami/matomo/README.md

@@ -207,7 +207,38 @@ You can use these snapshots to restore the application state should the upgrade
 
 ## Environment variables
 
-When you start the Matomo image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the docker run command line. If you want to add a new environment variable:
+When you start the Matomo image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the docker run command line. 
+
+##### User and Site configuration
+
+ - `MATOMO_USERNAME`: Matomo application username. Default: **User**
+ - `MATOMO_HOST`: Matomo application host. Default: **127.0.0.1**
+ - `MATOMO_PASSWORD`: Matomo application password. Default: **bitnami**
+ - `MATOMO_EMAIL`: Matomo application email. Default: **user@example.com**
+ - `MATOMO_WEBSITE_NAME`: Name of a website to track in Matomo. Default: **example**
+ - `MATOMO_WEBSITE_HOST`: Website's host or domain to track in Matomo. Default: **https://example.org**
+
+##### Use an existing database
+
+- `MARIADB_HOST`: Hostname for MariaDB server. Default: **mariadb**
+- `MARIADB_PORT_NUMBER`: Port used by MariaDB server. Default: **3306**
+- `MATOMO_DATABASE_NAME`: Database name that Matomo will use to connect with the database. Default: **bitnami_matomo**
+- `MATOMO_DATABASE_USER`: Database user that Matomo will use to connect with the database. Default: **bn_matomo**
+- `MATOMO_DATABASE_PASSWORD`: Database password that Matomo will use to connect with the database. No defaults.
+- `ALLOW_EMPTY_PASSWORD`: It can be used to allow blank passwords. Default: **no**
+
+##### Create a database for Matomo using mysql-client
+
+- `MARIADB_HOST`: Hostname for MariaDB server. Default: **mariadb**
+- `MARIADB_PORT_NUMBER`: Port used by MariaDB server. Default: **3306**
+- `MARIADB_ROOT_USER`: Database admin user. Default: **root**
+- `MARIADB_ROOT_PASSWORD`: Database password for the `MARIADB_ROOT_USER` user. No defaults.
+- `MYSQL_CLIENT_CREATE_DATABASE_NAME`: New database to be created by the mysql client module. No defaults.
+- `MYSQL_CLIENT_CREATE_DATABASE_USER`: New database user to be created by the mysql client module. No defaults.
+- `MYSQL_CLIENT_CREATE_DATABASE_PASSWORD`: Database password for the `MYSQL_CLIENT_CREATE_DATABASE_USER` user. No defaults.
+- `ALLOW_EMPTY_PASSWORD`: It can be used to allow blank passwords. Default: **no**
+
+If you want to add a new environment variable:
 
  * For docker-compose add the variable name and value under the application section:
 
@@ -226,19 +257,6 @@ application:
  $ docker run -d -e MATOMO_PASSWORD=my_password -p 80:80 --name matomo -v /your/local/path/bitnami/matomo:/bitnami --net=matomo_network bitnami/matomo
 ```
 
-Available variables:
-
- - `MATOMO_USERNAME`: Matomo application username. Default: **User**
- - `MATOMO_HOST`: Matomo application host. Default: **127.0.0.1**
- - `MATOMO_PASSWORD`: Matomo application password. Default: **bitnami**
- - `MATOMO_EMAIL`: Matomo application email. Default: **user@example.com**
- - `MATOMO_WEBSITE_NAME`: Name of a website to track in Matomo. Default: **example**
- - `MATOMO_WEBSITE_HOST`: Website's host or domain to track in Matomo. Default: **https://example.org**
- - `MARIADB_USER`: Root user for the MariaDB database. Default: **root**
- - `MARIADB_PASSWORD`: Root password for the MariaDB.
- - `MARIADB_HOST`: Hostname for MariaDB server. Default: **mariadb**
- - `MARIADB_PORT_NUMBER`: Port used by MariaDB server. Default: **3306**
-
 ### SMTP Configuration
 
 To configure Matomo to send email using SMTP you can set the following environment variables: