From f13b27d0b61fce67aab5424fab4f405fd3cbe2df Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Fri, 31 May 2024 18:02:37 +0000 Subject: [PATCH] Updating log-analytics to upstream (5.x) and bookworm --- matomo-log-analytics/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/matomo-log-analytics/Dockerfile b/matomo-log-analytics/Dockerfile index 1fe6e941..22239bf5 100644 --- a/matomo-log-analytics/Dockerfile +++ b/matomo-log-analytics/Dockerfile @@ -1,11 +1,11 @@ -FROM debian:bullseye-slim +FROM debian:bookworm-slim LABEL org.opencontainers.image.source https://github.com/kiwix/container-images RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates unzip wget patch python3 && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* -RUN wget -O /tmp/4.x-dev.zip https://github.com/matomo-org/matomo-log-analytics/archive/4.x-dev.zip && unzip -d /tmp /tmp/4.x-dev.zip && mv /tmp/matomo-log-analytics-4.x-dev/import_logs.py /usr/local/bin/ && chmod a+x /usr/local/bin/import_logs.py && rm -f /tmp/3.x-dev.zip && rm -rf /tmp/matomo-log-analytics-3.x-dev +RUN wget -O /tmp/5.x-dev.zip https://github.com/matomo-org/matomo-log-analytics/archive/5.x-dev.zip && unzip -d /tmp /tmp/5.x-dev.zip && mv /tmp/matomo-log-analytics-5.x-dev/import_logs.py /usr/local/bin/ && chmod a+x /usr/local/bin/import_logs.py && rm -f /tmp/3.x-dev.zip && rm -rf /tmp/matomo-log-analytics-3.x-dev COPY ignore_301.patch /tmp RUN patch /usr/local/bin/import_logs.py < /tmp/ignore_301.patch && rm /tmp/ignore_301.patch