Skip to content

Commit

Permalink
Merge branch 'release-3.7.0' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
BertrandGouny committed Nov 29, 2018
2 parents b51bbd2 + 9e680b0 commit 4f7ad84
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.0] - 2018-11-29
### Changed
- Matomo 3.7.0

## [3.6.1] - 2018-11-08
### Changed
- Matomo 3.6.1
Expand Down Expand Up @@ -80,6 +84,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## 2.16.2 - 2016-09-24
Initial release

[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
[3.5.1]: https://github.com/osixia/docker-matomo/compare/v3.5.0...v3.5.1
[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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NAME = osixia/matomo
VERSION = 3.6.1
VERSION = 3.7.0

.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

[hub]: https://hub.docker.com/r/osixia/matomo/

Latest release: 3.6.1 - Matomo 3.6.1 - [Changelog](CHANGELOG.md) | [Docker 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/) 

**A docker image to run Matomo (formerly Piwik).**
> [matomo.org](https://matomo.org)
Expand Down
2 changes: 1 addition & 1 deletion image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM osixia/web-baseimage:1.1.1

# Matomo version
ARG MATOMO_VERSION=3.6.1
ARG MATOMO_VERSION=3.7.0

# MariaDB version
ARG MARIADB_MAJOR=10.3
Expand Down

0 comments on commit 4f7ad84

Please sign in to comment.