diff --git a/bitnami/matomo/3/Dockerfile b/bitnami/matomo/3/Dockerfile index ff95f1f17646..22be7ddf3ecb 100644 --- a/bitnami/matomo/3/Dockerfile +++ b/bitnami/matomo/3/Dockerfile @@ -1,31 +1,31 @@ -FROM bitnami/minideb-extras:jessie-r22 +FROM bitnami/minideb-extras:jessie-r23 LABEL maintainer "Bitnami " # 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-0 --checksum 38af9f5ee6088655536238d9f70f4ce7fd6047e1c84fd5b02fa351efbc4f60c6 -RUN bitnami-pkg unpack php-7.0.26-0 --checksum 94f427cbd248f34f5bc7ef8f21f892fa8a133a5a3b808ed47a5761225954f8dd -RUN bitnami-pkg install mysql-client-10.1.29-0 --checksum 4b29436697f5fcdf38f3c9713a27208304fe36b858afc5aa5a7a4d3f17d84bac -RUN bitnami-pkg install libphp-7.0.26-0 --checksum d797c28ea51a77aa19707f3594176057f26a888d4fc6254db752433739cf974f -RUN bitnami-pkg unpack piwik-3.2.1-0 --checksum f0afb3afdc76e895edd82a535efaa40edeccdd629e6e6bd8040f721ed3623f71 +RUN bitnami-pkg unpack apache-2.4.29-1 --checksum 42114e87aafb1d519ab33451b6836873bca125d78ce7423c5f7f1de4a7198596 +RUN bitnami-pkg unpack php-7.0.27-0 --checksum 9e5a1ce65fce97b1c785cf8699c91de4a11c8d0bd8959e4b14a319fa0180b46f +RUN bitnami-pkg install mysql-client-10.1.30-0 --checksum 2f7bfecc0e405c53c0dc0508670af2b87124fbf3475f597fe8359e85d14e2a0c +RUN bitnami-pkg install libphp-7.0.27-0 --checksum b4936b7e66fca5a2bfb5c2a3ded1683d8c743894cdf8e15f7d5bde0413abd35d +RUN bitnami-pkg unpack matomo-3.3.0-0 --checksum 01029db2082bd75a7006e4232e3bd618dc3ff712a774beb169a535d6720074f7 COPY rootfs / ENV APACHE_HTTPS_PORT_NUMBER="443" \ APACHE_HTTP_PORT_NUMBER="80" \ - BITNAMI_APP_NAME="piwik" \ - BITNAMI_IMAGE_VERSION="3.2.1-r0" \ + BITNAMI_APP_NAME="matomo" \ + BITNAMI_IMAGE_VERSION="3.3.0-r0" \ MARIADB_HOST="mariadb" \ MARIADB_PASSWORD="" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_USER="root" \ + 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" \ PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:/opt/bitnami/mysql/bin:$PATH" \ - PIWIK_EMAIL="user@example.com" \ - PIWIK_HOST="127.0.0.1" \ - PIWIK_PASSWORD="bitnami" \ - PIWIK_USERNAME="User" \ - PIWIK_WEBSITE_HOST="https://example.org" \ - PIWIK_WEBSITE_NAME="example" \ SMTP_HOST="" \ SMTP_PASSWORD="" \ SMTP_PORT="" \ diff --git a/bitnami/matomo/3/docker-compose.yml b/bitnami/matomo/3/docker-compose.yml index 829ac9dcf1c4..e7d87fcd28b9 100644 --- a/bitnami/matomo/3/docker-compose.yml +++ b/bitnami/matomo/3/docker-compose.yml @@ -6,8 +6,8 @@ services: - ALLOW_EMPTY_PASSWORD=yes volumes: - 'mariadb_data:/bitnami' - piwik: - image: 'bitnami/piwik:3' + matomo: + image: 'bitnami/matomo:3' labels: kompose.service.type: nodeport ports: @@ -16,9 +16,9 @@ services: depends_on: - mariadb volumes: - - 'piwik_data:/bitnami' + - 'matomo_data:/bitnami' volumes: mariadb_data: driver: local - piwik_data: + matomo_data: driver: local diff --git a/bitnami/matomo/3/rootfs/app-entrypoint.sh b/bitnami/matomo/3/rootfs/app-entrypoint.sh index ae96bdbf9dc0..8ffa7b5c66ec 100755 --- a/bitnami/matomo/3/rootfs/app-entrypoint.sh +++ b/bitnami/matomo/3/rootfs/app-entrypoint.sh @@ -6,8 +6,8 @@ print_welcome_page if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then - nami_initialize apache php piwik - info "Starting piwik... " + nami_initialize apache php matomo + info "Starting matomo... " fi exec tini -- "$@" diff --git a/bitnami/matomo/3/rootfs/piwik-inputs.json b/bitnami/matomo/3/rootfs/matomo-inputs.json similarity index 61% rename from bitnami/matomo/3/rootfs/piwik-inputs.json rename to bitnami/matomo/3/rootfs/matomo-inputs.json index fb4382bef6cc..9bc11e5d24b7 100644 --- a/bitnami/matomo/3/rootfs/piwik-inputs.json +++ b/bitnami/matomo/3/rootfs/matomo-inputs.json @@ -3,15 +3,15 @@ "databaseAdminUser": "{{$global.env.MARIADB_USER}}", "databaseServerHost": "{{$global.env.MARIADB_HOST}}", "databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}", - "email": "{{$global.env.PIWIK_EMAIL}}", - "host": "{{$global.env.PIWIK_HOST}}", - "password": "{{$global.env.PIWIK_PASSWORD}}", + "email": "{{$global.env.MATOMO_EMAIL}}", + "host": "{{$global.env.MATOMO_HOST}}", + "password": "{{$global.env.MATOMO_PASSWORD}}", "smtpHost": "{{$global.env.SMTP_HOST}}", "smtpPassword": "{{$global.env.SMTP_PASSWORD}}", "smtpPort": "{{$global.env.SMTP_PORT}}", "smtpProtocol": "{{$global.env.SMTP_PROTOCOL}}", "smtpUser": "{{$global.env.SMTP_USER}}", - "username": "{{$global.env.PIWIK_USERNAME}}", - "websiteHost": "{{$global.env.PIWIK_WEBSITE_HOST}}", - "websiteName": "{{$global.env.PIWIK_WEBSITE_NAME}}" + "username": "{{$global.env.MATOMO_USERNAME}}", + "websiteHost": "{{$global.env.MATOMO_WEBSITE_HOST}}", + "websiteName": "{{$global.env.MATOM_WEBSITE_NAME}}" } \ No newline at end of file diff --git a/bitnami/matomo/README.md b/bitnami/matomo/README.md index e32d28065333..ddfee7e545ea 100644 --- a/bitnami/matomo/README.md +++ b/bitnami/matomo/README.md @@ -1,18 +1,18 @@ -[![CircleCI](https://circleci.com/gh/bitnami/bitnami-docker-piwik/tree/master.svg?style=shield)](https://circleci.com/gh/bitnami/bitnami-docker-piwik/tree/master) +[![CircleCI](https://circleci.com/gh/bitnami/bitnami-docker-matomo/tree/master.svg?style=shield)](https://circleci.com/gh/bitnami/bitnami-docker-matomo/tree/master) [![Slack](https://img.shields.io/badge/slack-join%20chat%20%E2%86%92-e01563.svg)](http://slack.oss.bitnami.com) -# What is Piwik? +# What is Matomo? -> Piwik is a free and open source web analytics application written by a team of international developers that runs on a PHP/MySQL webserver. It tracks online visits to one or more websites and displays reports on these visits for analysis. As of September 2015, Piwik was used by nearly 900 thousand websites, or 1.3% of all websites, and has been translated to more than 45 languages. New versions are regularly released every few weeks. +> Matomo is a free and open source web analytics application written by a team of international developers that runs on a PHP/MySQL webserver. It tracks online visits to one or more websites and displays reports on these visits for analysis. As of September 2015, Matomo was used by nearly 900 thousand websites, or 1.3% of all websites, and has been translated to more than 45 languages. New versions are regularly released every few weeks. -https://www.piwik.org/ +https://www.matomo.org/ # TL;DR; ## Docker Compose ```bash -$ curl -sSL https://raw.githubusercontent.com/bitnami/bitnami-docker-piwik/master/docker-compose.yml > docker-compose.yml +$ curl -sSL https://raw.githubusercontent.com/bitnami/bitnami-docker-matomo/master/docker-compose.yml > docker-compose.yml $ docker-compose up -d ``` @@ -30,26 +30,26 @@ To run this application you need [Docker Engine](https://www.docker.com/products # How to get this image -The recommended way to get the Bitnami Piwik Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/piwik/). -To use a specific version, you can pull a versioned tag. Find the [list of available versions] (https://hub.docker.com/r/bitnami/piwik/tags/) in the Docker Hub Registry. +The recommended way to get the Bitnami Matomo Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/matomo/). +To use a specific version, you can pull a versioned tag. Find the [list of available versions] (https://hub.docker.com/r/bitnami/matomo/tags/) in the Docker Hub Registry. ```bash -docker pull bitnami/piwik:[TAG] +docker pull bitnami/matomo:[TAG] ``` If you wish, you can also build the image youself. ```bash -docker build -t bitnami/piwik:latest https://github.com/bitnami/bitnami-docker-piwik.git +docker build -t bitnami/matomo:latest https://github.com/bitnami/bitnami-docker-matomo.git ``` # How to use this image -Piwik requires access to a MySQL database or MariaDB database to store information. It uses our [MariaDB image] (https://github.com/bitnami/bitnami-docker-mariadb) for the database requirements. +Matomo requires access to a MySQL database or MariaDB database to store information. It uses our [MariaDB image] (https://github.com/bitnami/bitnami-docker-mariadb) for the database requirements. -## Run the Piwik image using Docker Compose +## Run the Matomo image using Docker Compose -This is the recommended way to run Piwik. You can use the following docker compose template: +This is the recommended way to run Matomo. You can use the following docker compose template: ```yaml version: '2' @@ -62,44 +62,44 @@ services: volumes: - 'mariadb_data:/bitnami' application: - image: 'bitnami/piwik:latest' + image: 'bitnami/matomo:latest' ports: - '80:80' - '443:443' volumes: - - 'piwik_data:/bitnami' + - 'matomo_data:/bitnami' depends_on: - mariadb volumes: mariadb_data: driver: local - piwik_data: + matomo_data: driver: local ``` -## Run the Piwik image using the Docker Command Line +## Run the Matomo image using the Docker Command Line If you want to run the application manually instead of using docker-compose, these are the basic steps you need to run: 1. Create a new network for the application and the database: ```bash - $ docker network create piwik_network + $ docker network create matomo_network ``` 2. Start a MariaDB database in the network generated: ``` - $ docker run -d --name mariadb -e ALLOW_EMPTY_PASSWORD=yes --net=piwik_network bitnami/mariadb + $ docker run -d --name mariadb -e ALLOW_EMPTY_PASSWORD=yes --net=matomo_network bitnami/mariadb ``` - *Note:* You need to give the container a name in order to Piwik to resolve the host + *Note:* You need to give the container a name in order to Matomo to resolve the host -3. Run the Piwik container: +3. Run the Matomo container: ```bash - $ docker run -d -p 80:80 --name piwik --net=piwik_network bitnami/piwik + $ docker run -d -p 80:80 --name matomo --net=matomo_network bitnami/matomo ``` Then you can access your application at http://your-ip/ @@ -110,7 +110,7 @@ If you remove the container all your data and configurations will be lost, and t For persistence you should mount a volume at the `/bitnami` path. Additionally you should mount a volume for [persistence of the MariaDB data](https://github.com/bitnami/bitnami-docker-mariadb#persisting-your-database). -The above examples define docker volumes namely `mariadb_data` and `piwik_data`. The Piwik application state will persist as long as these volumes are not removed. +The above examples define docker volumes namely `mariadb_data` and `matomo_data`. The Matomo application state will persist as long as these volumes are not removed. To avoid inadvertent removal of these volumes you can [mount host directories as data volumes](https://docs.docker.com/engine/tutorials/dockervolumes/). Alternatively you can make use of volume plugins to host the volume data. @@ -128,15 +128,15 @@ services: - ALLOW_EMPTY_PASSWORD=yes volumes: - '/path/to/mariadb-persistence:/bitnami' - piwik: - image: 'bitnami/piwik:latest' + matomo: + image: 'bitnami/matomo:latest' depends_on: - mariadb ports: - '80:80' - '443:443' volumes: - - '/path/to/piwik-persistence:/bitnami' + - '/path/to/matomo-persistence:/bitnami' ``` ### Mount host directories as data volumes using the Docker command line @@ -146,47 +146,47 @@ In this case you need to specify the directories to mount on the run command. Th 1. Create a network (if it does not exist): ```bash - $ docker network create piwik-tier + $ docker network create matomo-tier ``` 2. Create a MariaDB container with host volume: ```bash $ docker run -d --name mariadb -e ALLOW_EMPTY_PASSWORD=yes \ - --net piwik-tier \ + --net matomo-tier \ --volume /path/to/mariadb-persistence:/bitnami \ bitnami/mariadb:latest ``` - *Note:* You need to give the container a name in order to Piwik to resolve the host + *Note:* You need to give the container a name in order to Matomo to resolve the host -3. Create the Piwik container with host volumes: +3. Create the Matomo container with host volumes: ```bash - $ docker run -d --name piwik -p 80:80 -p 443:443 \ - --net piwik-tier \ - --volume /path/to/piwik-persistence:/bitnami \ - bitnami/piwik:latest + $ docker run -d --name matomo -p 80:80 -p 443:443 \ + --net matomo-tier \ + --volume /path/to/matomo-persistence:/bitnami \ + bitnami/matomo:latest ``` -# Upgrading Piwik +# Upgrading Matomo -Bitnami provides up-to-date versions of MariaDB and Piwik, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. We will cover here the upgrade of the Piwik container. For the MariaDB upgrade you can take a look at https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#upgrade-this-image +Bitnami provides up-to-date versions of MariaDB and Matomo, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. We will cover here the upgrade of the Matomo container. For the MariaDB upgrade you can take a look at https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#upgrade-this-image 1. Get the updated images: ```bash - $ docker pull bitnami/piwik:latest + $ docker pull bitnami/matomo:latest ``` 2. Stop your container - * For docker-compose: `$ docker-compose stop piwik` - * For manual execution: `$ docker stop piwik` + * For docker-compose: `$ docker-compose stop matomo` + * For manual execution: `$ docker stop matomo` 3. Take a snapshot of the application state ```bash -$ rsync -a /path/to/piwik-persistence /path/to/piwik-persistence.bkp.$(date +%Y%m%d-%H.%M.%S) +$ rsync -a /path/to/matomo-persistence /path/to/matomo-persistence.bkp.$(date +%Y%m%d-%H.%M.%S) ``` Additionally, [snapshot the MariaDB data](https://github.com/bitnami/bitnami-docker-mariadb#step-2-stop-and-backup-the-currently-running-container) @@ -195,45 +195,45 @@ You can use these snapshots to restore the application state should the upgrade 4. Remove the currently running container - * For docker-compose: `$ docker-compose rm -v piwik` - * For manual execution: `$ docker rm -v piwik` + * For docker-compose: `$ docker-compose rm -v matomo` + * For manual execution: `$ docker rm -v matomo` 5. Run the new image - * For docker-compose: `$ docker-compose start piwik` - * For manual execution ([mount](#mount-persistent-folders-manually) the directories if needed): `docker run --name piwik bitnami/piwik:latest` + * For docker-compose: `$ docker-compose start matomo` + * For manual execution ([mount](#mount-persistent-folders-manually) the directories if needed): `docker run --name matomo bitnami/matomo:latest` # Configuration ## Environment variables -When you start the Piwik 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. If you want to add a new environment variable: * For docker-compose add the variable name and value under the application section: ```yaml application: - image: bitnami/piwik:latest + image: bitnami/matomo:latest ports: - 80:80 environment: - - PIWIK_PASSWORD=my_password + - MATOMO_PASSWORD=my_password ``` * For manual execution add a `-e` option with each variable and value: ```bash - $ docker run -d -e PIWIK_PASSWORD=my_password -p 80:80 --name piwik -v /your/local/path/bitnami/piwik:/bitnami --net=piwik_network bitnami/piwik + $ 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: - - `PIWIK_USERNAME`: Piwik application username. Default: **User** - - `PIWIK_HOST`: Piwik application host. Default: **127.0.0.1** - - `PIWIK_PASSWORD`: Piwik application password. Default: **bitnami** - - `PIWIK_EMAIL`: Piwik application email. Default: **user@example.com** - - `PIWIK_WEBSITE_NAME`: Name of a website to track in Piwik. Default: **example** - - `PIWIK_WEBSITE_HOST`: Website's host or domain to track in Piwik. Default: **https://example.org** + - `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** @@ -241,13 +241,13 @@ Available variables: ### SMTP Configuration -To configure Piwik to send email using SMTP you can set the following environment variables: +To configure Matomo to send email using SMTP you can set the following environment variables: - - `SMTP_HOST`: Piwik SMTP host. - - `SMTP_PORT`: Piwik SMTP port. - - `SMTP_USER`: Piwik SMTP account user. - - `SMTP_PASSWORD`: Piwik SMTP account password. - - `SMTP_PROTOCOL`: Piwik SMTP protocol to use. + - `SMTP_HOST`: Matomo SMTP host. + - `SMTP_PORT`: Matomo SMTP port. + - `SMTP_USER`: Matomo SMTP account user. + - `SMTP_PASSWORD`: Matomo SMTP account password. + - `SMTP_PROTOCOL`: Matomo SMTP protocol to use. This would be an example of SMTP configuration using a Gmail account: @@ -255,7 +255,7 @@ This would be an example of SMTP configuration using a Gmail account: ```yaml application: - image: bitnami/piwik:latest + image: bitnami/matomo:latest ports: - 80:80 environment: @@ -270,16 +270,16 @@ This would be an example of SMTP configuration using a Gmail account: ```bash $ docker run -d -e SMTP_HOST=smtp.gmail.com -e SMTP_PROTOCOL=TLS -e SMTP_PORT=587 -e SMTP_USER=your_email@gmail.com -e \ - SMTP_PASSWORD=your_password -p 80:80 --name piwik -v /your/local/path/bitnami/piwik:/bitnami bitnami/piwik + SMTP_PASSWORD=your_password -p 80:80 --name matomo -v /your/local/path/bitnami/matomo:/bitnami bitnami/matomo ``` # Contributing -We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/bitnami-docker-piwik/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-piwik/pulls) with your contribution. +We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/bitnami-docker-matomo/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-matomo/pulls) with your contribution. # Issues -If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/bitnami-docker-piwik/issues). For us to provide better support, be sure to include the following information in your issue: +If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/bitnami-docker-matomo/issues). For us to provide better support, be sure to include the following information in your issue: - Host OS and version - Docker version (`docker version`) @@ -295,7 +295,7 @@ Discussions are archived at [bitnami-oss.slackarchive.io](https://bitnami-oss.sl # License -Copyright 2017 Bitnami +Copyright 2018 Bitnami Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/bitnami/matomo/circle.yml b/bitnami/matomo/circle.yml index 966b4fed810c..b4b29dac9559 100644 --- a/bitnami/matomo/circle.yml +++ b/bitnami/matomo/circle.yml @@ -7,7 +7,7 @@ jobs: environment: RELEASE_SERIES_LIST: "3" LATEST_STABLE: "3" - IMAGE_NAME: piwik + IMAGE_NAME: matomo DOCKER_PROJECT: bitnami QUAY_PROJECT: bitnami GCLOUD_PROJECT: bitnami-containers