Skip to content

Commit

Permalink
Updating log-analytics to upstream (5.x) and bookworm
Browse files Browse the repository at this point in the history
  • Loading branch information
rgaudin committed May 31, 2024
1 parent e9f32bf commit f13b27d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions matomo-log-analytics/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit f13b27d

Please sign in to comment.