From 361841e18b46935ba0210561c4cd78b8753b980f Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Fri, 26 Jul 2019 15:43:26 +0200 Subject: [PATCH 1/2] [twgit] Init release 'release-3.11.0'. From c368d95b6954a75477665812a542888dbf3ba312 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Fri, 26 Jul 2019 17:16:47 +0200 Subject: [PATCH 2/2] v3.11.0 --- CHANGELOG.md | 10 +++++-- Makefile | 2 +- README.md | 2 +- image/Dockerfile | 30 +++++++++---------- image/environment/default.yaml | 2 +- image/service/backup/assets/cronjobs | 2 +- .../{php7.0-fpm => php7.3-fpm}/opcache.ini | 0 .../{php7.0-fpm => php7.3-fpm}/pool.conf | 0 image/service/matomo/install.sh | 12 ++++---- test/test.bats | 2 +- 10 files changed, 34 insertions(+), 28 deletions(-) rename image/service/matomo/assets/{php7.0-fpm => php7.3-fpm}/opcache.ini (100%) rename image/service/matomo/assets/{php7.0-fpm => php7.3-fpm}/pool.conf (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f77cd8..dcdba1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ 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.11.0] - 2019-07-26 +### Changed + - Matomo 3.11.0 + - Upgrade baseimage: web-baseimage:1.2.0 + ## [3.9.1-1] - 2019-04-06 ### Fixed - Cron log with /usr/bin/logger @@ -45,11 +50,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - MariaDB ssl ### Changed - - Matomo 3.5.0 (formerly Piwik) + - Matomo 3.5.0 ## [3.4.0] - 2018-03-28 ### Changed - - Matomo 3.4.0 (formerly Piwik) + - Matomo 3.4.0 ## [3.3.0] - 2018-01-13 ### Changed @@ -104,6 +109,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## 2.16.2 - 2016-09-24 Initial release +[3.9.1-1]: https://github.com/osixia/docker-matomo/compare/v3.9.1-1...v3.11.0 [3.9.1-1]: https://github.com/osixia/docker-matomo/compare/v3.9.1...v3.9.1-1 [3.9.1]: https://github.com/osixia/docker-matomo/compare/v3.8.1...v3.9.1 [3.8.1]: https://github.com/osixia/docker-matomo/compare/v3.8.0...v3.8.1 diff --git a/Makefile b/Makefile index 19b566d..8b123f3 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/matomo -VERSION = 3.9.1-1 +VERSION = 3.11.0 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index 6cae7b3..00c20d7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [hub]: https://hub.docker.com/r/osixia/matomo/ -Latest release: 3.9.1-1 - Matomo 3.9.1 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/matomo/)  +Latest release: 3.11.0 - Matomo 3.11.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 --git a/image/Dockerfile b/image/Dockerfile index 69ad6e5..64d09cc 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,14 +1,14 @@ -FROM osixia/web-baseimage:1.1.2 +FROM osixia/web-baseimage:1.2.0 # Matomo version -ARG MATOMO_VERSION=3.9.1 +ARG MATOMO_VERSION=3.11.0 # MariaDB version ARG MARIADB_MAJOR=10.3 -# Install apache2 and php7.0-fpm using osixia/baseimage utils +# Install apache2 and php7.3-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 +# php7.3-fpm install will detect apache2 and configure it # Add MariaDB repository RUN apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 \ @@ -22,22 +22,22 @@ RUN apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24 # 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 \ + && /container/tool/add-service-available :apache2 :php7.3-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 \ + php-cli \ + php-curl \ + php-gd \ + php-geoip \ + php-ldap \ + php-mbstring \ + php-mysql \ + php-xml \ + msmtp \ zip \ - && curl -o matomo.tar.gz -SL https://builds.matomo.org/piwik-${MATOMO_VERSION}.tar.gz \ + && curl -o matomo.tar.gz -SL https://builds.matomo.org/matomo-${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 \ diff --git a/image/environment/default.yaml b/image/environment/default.yaml index 02ba1c8..bfde2a6 100644 --- a/image/environment/default.yaml +++ b/image/environment/default.yaml @@ -40,4 +40,4 @@ 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 +SSL_HELPER_AUTO_RENEW_SERVICES_IMPACTED: :apache2 :php7.3-fpm diff --git a/image/service/backup/assets/cronjobs b/image/service/backup/assets/cronjobs index 44d210b..bc24afa 100644 --- a/image/service/backup/assets/cronjobs +++ b/image/service/backup/assets/cronjobs @@ -1,5 +1,5 @@ # Backup mail directory MAILTO="" {{ MATOMO_BACKUP_CRON_EXP }} root /sbin/matomo-backup 2>&1 | /usr/bin/logger -t cron_backup -{{ MATOMO_ARCHIVE_CRON_EXP }} www-data /usr/bin/php7.0 /var/www/matomo/console core:archive --url={{ MATOMO_SERVER_BASE_URL }}{{ MATOMO_SERVER_PATH }}/ 2>&1 | /usr/bin/logger -t cron_matomo_archive +{{ MATOMO_ARCHIVE_CRON_EXP }} www-data /usr/bin/php7.3 /var/www/matomo/console core:archive --url={{ MATOMO_SERVER_BASE_URL }}{{ MATOMO_SERVER_PATH }}/ 2>&1 | /usr/bin/logger -t cron_matomo_archive # empty line diff --git a/image/service/matomo/assets/php7.0-fpm/opcache.ini b/image/service/matomo/assets/php7.3-fpm/opcache.ini similarity index 100% rename from image/service/matomo/assets/php7.0-fpm/opcache.ini rename to image/service/matomo/assets/php7.3-fpm/opcache.ini diff --git a/image/service/matomo/assets/php7.0-fpm/pool.conf b/image/service/matomo/assets/php7.3-fpm/pool.conf similarity index 100% rename from image/service/matomo/assets/php7.0-fpm/pool.conf rename to image/service/matomo/assets/php7.3-fpm/pool.conf diff --git a/image/service/matomo/install.sh b/image/service/matomo/install.sh index 9e2f0c9..e806911 100755 --- a/image/service/matomo/install.sh +++ b/image/service/matomo/install.sh @@ -5,14 +5,14 @@ ln -sf /container/service/matomo/assets/apache2/matomo.conf /etc/apache2/sites-available/matomo.conf ln -sf /container/service/matomo/assets/apache2/matomo-ssl.conf /etc/apache2/sites-available/matomo-ssl.conf -cat /container/service/matomo/assets/php7.0-fpm/pool.conf >> /etc/php/7.0/fpm/pool.d/www.conf -rm /container/service/matomo/assets/php7.0-fpm/pool.conf +cat /container/service/matomo/assets/php7.3-fpm/pool.conf >> /etc/php/7.3/fpm/pool.d/www.conf +rm /container/service/matomo/assets/php7.3-fpm/pool.conf -cp -f /container/service/matomo/assets/php7.0-fpm/opcache.ini /etc/php/7.0/fpm/conf.d/opcache.ini -rm /container/service/matomo/assets/php7.0-fpm/opcache.ini +cp -f /container/service/matomo/assets/php7.3-fpm/opcache.ini /etc/php/7.3/fpm/conf.d/opcache.ini +rm /container/service/matomo/assets/php7.3-fpm/opcache.ini -echo "open_basedir = /var/www" >> /etc/php/7.0/fpm/php.ini -echo "geoip.custom_directory=/var/www/matomo/misc" >> /etc/php/7.0/fpm/php.ini +echo "open_basedir = /var/www" >> /etc/php/7.3/fpm/php.ini +echo "geoip.custom_directory=/var/www/matomo/misc" >> /etc/php/7.3/fpm/php.ini mkdir -p /var/www/tmp chown www-data:www-data /var/www/tmp diff --git a/test/test.bats b/test/test.bats index c752646..76619ab 100644 --- a/test/test.bats +++ b/test/test.bats @@ -14,7 +14,7 @@ load test_helper rm -f $tmp_file run_image - wait_process apache2 php-fpm7.0 + wait_process apache2 php-fpm7.3 sleep 1 curl --silent --insecure https://$CONTAINER_IP >> $tmp_file run grep -c "installation-progress" $tmp_file