Skip to content

Commit

Permalink
Matomo upgrade to 5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Gavin Morris committed Jan 26, 2024
1 parent d0421f7 commit 2c14ff3
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 4 deletions.
8 changes: 4 additions & 4 deletions matomo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ FROM nginx

ARG TARGETARCH

ARG MATOMO_VERSION="4.16.0"
ARG MATOMO_VERSION="5.0.1"
ARG MATOMO_FILE="${MATOMO_VERSION}.tar.gz"
ARG MATOMO_URL="https://builds.matomo.org/matomo-${MATOMO_FILE}"
ARG MATOMO_SHA256="385653e35f795935b0d97340c8688d8b15ba85234a0b72320696b990cf4f0959"
ARG MATOMO_SHA256="e1db485229da10fb6e11a6a781d95a22cc34c5db86e0079411a214274209f03c"

ARG EXTRA_TOOLS_VERSION="4.1.0-beta5"
ARG EXTRA_TOOLS_VERSION="5.0.0-beta3"
ARG EXTRA_TOOLS_FILE="${EXTRA_TOOLS_VERSION}.tar.gz"
ARG EXTRA_TOOLS_URL="https://github.com/digitalist-se/extratools/archive/refs/tags/${EXTRA_TOOLS_FILE}"
ARG EXTRA_TOOLS_SHA256="ce9c9f1d01aaf04e3dfded21d6b9080c1fda633535295dc1c8cd0427bcdc826f"
ARG EXTRA_TOOLS_SHA256="96190d6392bc45332eb9033216ea4c436e71496b48ee9a23d4647934d8051cae"

EXPOSE 8000

Expand Down
63 changes: 63 additions & 0 deletions matomo/Dockerfile-e
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# syntax=docker/dockerfile:1.5.1
FROM nginx

ARG TARGETARCH

ARG MATOMO_VERSION="5.0.1"
ARG MATOMO_FILE="${MATOMO_VERSION}.tar.gz"
ARG MATOMO_URL="https://builds.matomo.org/matomo-${MATOMO_FILE}"
ARG MATOMO_SHA256="e1db485229da10fb6e11a6a781d95a22cc34c5db86e0079411a214274209f03c"

ARG EXTRA_TOOLS_VERSION="5.0.0-beta3"
ARG EXTRA_TOOLS_FILE="${EXTRA_TOOLS_VERSION}.tar.gz"
ARG EXTRA_TOOLS_URL="https://github.com/digitalist-se/extratools/archive/refs/tags/${EXTRA_TOOLS_FILE}"
ARG EXTRA_TOOLS_SHA256=""

EXPOSE 8000

WORKDIR /var/www/matomo

# Composer require statements are for supporting the Extra Tools plugin.
#
# Platform agnostic does not require arch specific identifier.
RUN --mount=type=cache,id=matomo-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \
download.sh \
--url "${MATOMO_URL}" \
--sha256 "${MATOMO_SHA256}" \
--strip \
--dest /var/www/matomo \
&& \
wget --directory-prefix=/var/www/matomo "https://raw.githubusercontent.com/matomo-org/matomo/${MATOMO_VERSION}/composer.json" && \
wget --directory-prefix=/var/www/matomo "https://raw.githubusercontent.com/matomo-org/matomo/${MATOMO_VERSION}/composer.lock" && \
composer require -d /var/www/matomo symfony/yaml:~2.6.0 && \
composer require -d /var/www/matomo symfony/process:^5.4 && \
composer install -d /var/www/matomo && \
download.sh \
--url "${EXTRA_TOOLS_URL}" \
--sha256 "${EXTRA_TOOLS_SHA256}" \
--strip \
--dest /var/www/matomo/plugins/ExtraTools && \
cleanup.sh

# The driver is given explicitly to prevent accidentially overriding as Matomo
# only supports MySQL.
ENV \
MATOMO_ASSUME_SECURE_PROTOCOL=1 \
MATOMO_DB_DRIVER=mysql \
MATOMO_DB_NAME=matomo \
MATOMO_DB_PASSWORD=password \
MATOMO_DB_USER=matomo \
MATOMO_DEFAULT_HOST=https://islandora.traefik.me \
MATOMO_DEFAULT_NAME=Islandora \
MATOMO_DEFAULT_TIMEZONE=America/Halifax \
MATOMO_FORCE_SSL=1 \
MATOMO_PROXY_CLIENT_HEADERS=HTTP_X_FORWARDED_FOR \
MATOMO_PROXY_HOST_HEADERS=HTTP_X_FORWARDED_HOST \
MATOMO_PROXY_URI_HEADER=1 \
[email protected] \
MATOMO_USER_NAME=admin \
MATOMO_USER_PASS=password

COPY --link rootfs /

RUN chown -R nginx:nginx /var/www

0 comments on commit 2c14ff3

Please sign in to comment.