Skip to content

Commit 53a9025

Browse files
BertrandGounyBertrandGouny
committed
Merge branch 'release-3.12.0' into stable
2 parents b7fdf96 + fde65d3 commit 53a9025

File tree

5 files changed

+150
-44
lines changed

5 files changed

+150
-44
lines changed

Diff for: ‎.travis.yml

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
language: bash
2+
3+
services:
4+
- docker
5+
env:
6+
global:
7+
- NAME="osixia/matomo"
8+
- VERSION="${TRAVIS_BRANCH}-dev"
9+
matrix:
10+
- TARGET_ARCH=amd64 QEMU_ARCH=x86_64
11+
- TARGET_ARCH=arm32v7 QEMU_ARCH=arm
12+
- TARGET_ARCH=arm64v8 QEMU_ARCH=aarch64
13+
14+
addons:
15+
apt:
16+
# The docker manifest command was added in docker-ee version 18.x
17+
# So update our current installation and we also have to enable the experimental features.
18+
sources:
19+
- sourceline: "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
20+
key_url: "https://download.docker.com/linux/ubuntu/gpg"
21+
packages:
22+
- docker-ce
23+
24+
before_install:
25+
- docker --version
26+
- mkdir $HOME/.docker
27+
- 'echo "{" > $HOME/.docker/config.json'
28+
- 'echo " \"experimental\": \"enabled\"" >> $HOME/.docker/config.json'
29+
- 'echo "}" >> $HOME/.docker/config.json'
30+
- sudo service docker restart
31+
32+
install:
33+
# For cross buidling our images
34+
# This is necessary because travis-ci.org has only x86_64 machines.
35+
# If travis-ci.org gets native arm builds, probably this step is not
36+
# necessary any more.
37+
- docker run --rm --privileged multiarch/qemu-user-static:register --reset
38+
# Bats is necessary for the UT
39+
- curl -o bats.tar.gz -SL https://github.com/bats-core/bats-core/archive/v1.1.0.tar.gz
40+
- mkdir bats-core && tar -xf bats.tar.gz -C bats-core --strip-components=1
41+
- cd bats-core/
42+
- sudo ./install.sh /usr/local
43+
- cd ..
44+
45+
before_script:
46+
# Set baseimage.
47+
- sed -i -e "s/FROM \(.*\)/FROM \1-${TARGET_ARCH}/g" image/Dockerfile;
48+
- cat image/Dockerfile;
49+
# If this is a tag then change the VERSION variable to only have the
50+
# tag name and not also the commit hash.
51+
- if [ -n "$TRAVIS_TAG" ]; then
52+
VERSION=$(echo "${TRAVIS_TAG}" | sed -e 's/\(.*\)[-v]\(.*\)/\1\2/g');
53+
fi
54+
- if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
55+
VERSION="stable";
56+
fi
57+
58+
script:
59+
- make build-nocache NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
60+
# Run the test and if the test fails mark the build as failed.
61+
- make test NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
62+
63+
before_deploy:
64+
- docker run -d --name test_image ${NAME}:${VERSION}-${TARGET_ARCH} sleep 10
65+
- sleep 5
66+
- sudo docker ps | grep -q test_image
67+
# To have `DOCKER_USER` and `DOCKER_PASS`
68+
# use `travis env set`.
69+
- docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
70+
- make tag NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
71+
72+
deploy:
73+
provider: script
74+
on:
75+
all_branches: true
76+
script: make push NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
77+
78+
jobs:
79+
include:
80+
- stage: Manifest creation
81+
install: skip
82+
script: skip
83+
after_deploy:
84+
- docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
85+
- docker manifest create ${NAME}:${VERSION} ${NAME}:${VERSION}-amd64 ${NAME}:${VERSION}-arm32v7 ${NAME}:${VERSION}-arm64v8;
86+
docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-amd64 --os linux --arch amd64;
87+
docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-arm32v7 --os linux --arch arm --variant v7;
88+
docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-arm64v8 --os linux --arch arm64 --variant v8;
89+
90+
# The latest tag is coming from the stable branch of the repo
91+
- if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
92+
docker manifest create ${NAME}:latest ${NAME}:${VERSION}-amd64 ${NAME}:${VERSION}-arm32v7 ${NAME}:${VERSION}-arm64v8;
93+
docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-amd64 --os linux --arch amd64;
94+
docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-arm32v7 --os linux --arch arm --variant v7;
95+
docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-arm64v8 --os linux --arch arm64 --variant v8;
96+
fi
97+
98+
- docker manifest push ${NAME}:${VERSION};
99+
if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
100+
docker manifest push ${NAME}:latest;
101+
fi

Diff for: ‎CHANGELOG.md

+31-21
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,17 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [3.12.0] - 2019-11-09
8+
## Added
9+
- Multiarch support
10+
11+
### Changed
12+
- Upgrade Matomo version to 3.12.0
13+
- Upgrade baseimage to web-baseimage:1.2.0 (debian buster)
14+
715
## [3.11.0] - 2019-07-26
816
### Changed
9-
- Matomo 3.11.0
17+
- Upgrade Matomo version to 3.11.0
1018
- Upgrade baseimage: web-baseimage:1.2.0
1119

1220
## [3.9.1-1] - 2019-04-06
@@ -16,82 +24,83 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1624

1725
## [3.9.1] - 2019-03-21
1826
### Changed
19-
- Matomo 3.9.1
27+
- Upgrade Matomo version to 3.9.1
2028

2129
### Fixed
2230
- Cron log to /proc/self/fd/1 and /proc/self/fd/2
2331

2432
## [3.8.1] - 2019-01-30
2533
### Changed
26-
- Matomo 3.8.1
34+
- Upgrade Matomo version to 3.8.1
2735

2836
## [3.8.0] - 2019-01-22
2937
### Changed
30-
- Matomo 3.8.0
38+
- Upgrade Matomo version to 3.8.0
3139

3240
## [3.7.0] - 2018-11-29
3341
### Changed
34-
- Matomo 3.7.0
42+
- Upgrade Matomo version to 3.7.0
3543

3644
## [3.6.1] - 2018-11-08
3745
### Changed
38-
- Matomo 3.6.1
46+
- Upgrade Matomo version to 3.6.1
3947

4048
## [3.6.0] - 2018-09-05
4149
### Changed
42-
- Matomo 3.6.0
50+
- Upgrade Matomo version to 3.6.0
4351

4452
## [3.5.1] - 2018-05-26
4553
### Changed
46-
- Matomo 3.5.1
54+
- Upgrade Matomo version to 3.5.1
4755

4856
## [3.5.0] - 2018-05-16
4957
### Added
5058
- MariaDB ssl
5159

5260
### Changed
53-
- Matomo 3.5.0
61+
- Upgrade Matomo version to 3.5.0
5462

5563
## [3.4.0] - 2018-03-28
5664
### Changed
57-
- Matomo 3.4.0
65+
- Upgrade Matomo version to 3.4.0
5866

5967
## [3.3.0] - 2018-01-13
6068
### Changed
61-
- Matomo 3.3.0 (formerly Piwik)
69+
- Upgrade Matomo version to 3.3.0 (formerly Piwik)
6270
- Upgrade baseimage: web-baseimage:1.1.1
6371

6472
## [3.2.1] - 2017-12-07
6573
### Changed
66-
- Piwik 3.2.1
74+
- Upgrade Piwik version to 3.2.1
6775

6876
## [3.2.0] - 2017-12-06
6977
### Added
7078
- robots.txt
7179
### Changed
72-
- Piwik 3.2.0
80+
- Upgrade Piwik version to 3.2.0
7381
- Upgrade baseimage: web-baseimage:1.1.1
7482

7583
## [3.1.1] - 2017-10-12
7684
### Added
77-
- MATOMO_FORCE_UPDATE environment variable
85+
- PIWIK_FORCE_UPDATE environment variable
86+
7887
### Changed
79-
- Piwik 3.1.1
88+
- Upgrade Piwik version to 3.1.1
8089

8190
## [3.1.0] - 2017-09-20
8291
### Added
8392
- Opcache config
8493
### Changed
85-
- Piwik 3.1.0
94+
- Upgrade Piwik version to 3.1.0
8695

8796
## [3.0.4] - 2017-07-19
8897
### Changed
89-
- Piwik 3.0.4
98+
- Upgrade Piwik version to 3.0.4
9099
- Upgrade baseimage: web-baseimage:1.1.0 (debian stretch, php7)
91100

92101
## [2.17.1] - 2016-11-14
93102
### Changed
94-
- Piwik 2.17.1
103+
- Upgrade Piwik version to 2.17.1
95104
- chmod 600 on backups
96105
- Upgrade baseimage: web-baseimage:0.1.12
97106

@@ -100,16 +109,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
100109
- Database backup
101110
- Ldap tls configuration
102111
### Changed
103-
- Piwik 2.17.0
112+
- Upgrade Piwik version to 2.17.0
104113

105114
## [2.16.5] - 2016-10-17
106115
### Changed
107-
- Piwik 2.16.5
116+
- Upgrade Piwik version to 2.16.5
108117

109118
## 2.16.2 - 2016-09-24
110119
Initial release
111120

112-
[3.9.1-1]: https://github.com/osixia/docker-matomo/compare/v3.9.1-1...v3.11.0
121+
[3.12.0]: https://github.com/osixia/docker-matomo/compare/v3.11.0...v3.12.0
122+
[3.11.0]: https://github.com/osixia/docker-matomo/compare/v3.9.1-1...v3.11.0
113123
[3.9.1-1]: https://github.com/osixia/docker-matomo/compare/v3.9.1...v3.9.1-1
114124
[3.9.1]: https://github.com/osixia/docker-matomo/compare/v3.8.1...v3.9.1
115125
[3.8.1]: https://github.com/osixia/docker-matomo/compare/v3.8.0...v3.8.1

Diff for: ‎Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME = osixia/matomo
2-
VERSION = 3.11.0
2+
VERSION = 3.12.0
33

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

@@ -12,6 +12,9 @@ build-nocache:
1212
test:
1313
env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
1414

15+
tag:
16+
docker tag $(NAME):$(VERSION) $(NAME):$(VERSION)
17+
1518
tag-latest:
1619
docker tag $(NAME):$(VERSION) $(NAME):latest
1720

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

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

9-
Latest release: 3.11.0 - Matomo 3.11.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/matomo/) 
9+
Latest release: 3.12.0 - Matomo 3.12.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/matomo/) 
1010

1111
**A docker image to run Matomo (formerly Piwik).**
1212
> [matomo.org](https://matomo.org)

Diff for: ‎image/Dockerfile

+13-21
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
1-
FROM osixia/web-baseimage:1.2.0
1+
FROM osixia/web-baseimage:release-1.2.0-dev
22

33
# Matomo version
4-
ARG MATOMO_VERSION=3.11.0
5-
6-
# MariaDB version
7-
ARG MARIADB_MAJOR=10.3
8-
9-
# Install apache2 and php7.3-fpm using osixia/baseimage utils
10-
# Caution: /container/tool/install-service-available arguments order is important
11-
# php7.3-fpm install will detect apache2 and configure it
12-
13-
# Add MariaDB repository
14-
RUN apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 \
15-
&& echo "deb http://ftp.igh.cnrs.fr/pub/mariadb/repo/$MARIADB_MAJOR/debian stretch main" > /etc/apt/sources.list.d/mariadb.list \
16-
&& { \
17-
echo 'Package: *'; \
18-
echo 'Pin: release o=MariaDB'; \
19-
echo 'Pin-Priority: 999'; \
20-
} > /etc/apt/preferences.d/mariadb
21-
22-
# Download, check integrity and unzip phpMyAdmin to /var/www/matomo_bootstrap
4+
ARG MATOMO_VERSION=3.12.0
5+
6+
# Add multiple process stack to supervise apache2 and php7.3-fpm
7+
# sources: https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/add-multiple-process-stack
8+
# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/add-service-available
9+
#  https://github.com/osixia/docker-web-baseimage/blob/stable/image/service-available/:apache2/download.sh
10+
# https://github.com/osixia/docker-web-baseimage/blob/stable/image/service-available/:php7.3-fpm/download.sh
11+
# https://github.com/osixia/light-baseimage/blob/stable/image/service-available/:ssl-tools/download.sh
12+
# Install ca-certificates, curl and php dependencies
13+
# Download matomo, check file integrity, and unzip matomo to /var/www/matomo_bootstrap
14+
# Remove curl
2315
RUN apt-get update \
2416
&& /container/tool/add-multiple-process-stack \
2517
&& /container/tool/add-service-available :apache2 :php7.3-fpm :ssl-tools \
2618
&& LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
2719
ca-certificates \
2820
curl \
29-
mariadb-client-$MARIADB_MAJOR \
21+
mariadb-client \
3022
php-cli \
3123
php-curl \
3224
php-gd \

0 commit comments

Comments
 (0)