Skip to content

Commit

Permalink
Matomo upgrade to 5.x (#324)
Browse files Browse the repository at this point in the history
  • Loading branch information
g7morris authored Jan 30, 2024
1 parent d0421f7 commit 628627e
Show file tree
Hide file tree
Showing 2 changed files with 6 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
2 changes: 2 additions & 0 deletions matomo/rootfs/etc/s6-overlay/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ function install {
s6-setuidgid nginx /var/www/matomo/console plugin:activate ExtraTools

# Add additional configurations.
add_setting General "trusted_hosts[]" "${MATOMO_DEFAULT_HOST}"
add_setting General "assume_secure_protocol" "${MATOMO_ASSUME_SECURE_PROTOCOL}"
add_setting General "proxy_client_headers[]" "${MATOMO_PROXY_CLIENT_HEADERS}"
add_setting General "proxy_host_headers" "${MATOMO_PROXY_HOST_HEADERS}"
Expand All @@ -63,6 +64,7 @@ function install {
# shellcheck disable=SC2001
name=$(echo "${site}" | sed -e 's/MATOMO_SITE_\(.*\)_HOST/\1/')
s6-setuidgid nginx /var/www/matomo/console site:add --name="${name}" --urls="${!site}"
add_setting General "trusted_hosts[]" "${!site}"
done
}

Expand Down

0 comments on commit 628627e

Please sign in to comment.