[matomo-web] Revert "Install maxminddb PHP extension"



commit 8e5767fef43c913598c132ed8f905be295f40858
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Mon Dec 28 23:38:05 2020 +0100

    Revert "Install maxminddb PHP extension"
    
    This reverts commit dc26bbdbdec6cb69ddf109730670aa45155c2305.

 matomo/Dockerfile | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index 774984a..270ff0e 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -1,24 +1,9 @@
-FROM matomo:4-fpm as builder
+FROM matomo:4-fpm 
 
 USER root
 
 RUN apt-get update && \
-    apt-get install -y git build-essential automake libtool autoconf unzip
-
-RUN git clone --recursive https://github.com/maxmind/libmaxminddb && \
-    cd libmaxminddb && \
-    autoreconf -fiv && ./configure && \
-    make && make install && \
-    cd .. && rm -rf libmaxminddb
-
-RUN git clone --recursive https://github.com/maxmind/MaxMind-DB-Reader-php && \
-    cd MaxMind-DB-Reader-php/ext && \
-    phpize && \
-    cp /usr/share/libtool/build-aux/config.guess . && \
-    cp /usr/share/libtool/build-aux/config.sub . && \
-    ./configure && make && make install && \
-    echo 'extension=maxminddb.so' > /usr/local/etc/php/conf.d/maxminddb.ini && \
-    cd .. && rm -rf MaxMind-DB-Reader-php
+    apt-get install unzip
 
 COPY ipa-ca.crt /usr/local/share/ca-certificates/ipa-ca.crt
 RUN update-ca-certificates
@@ -29,7 +14,7 @@ RUN mkdir -p /opt/matomo/extra-plugins && \
     -o LoginLdap-4.2.2.zip && \
     unzip LoginLdap-4.2.2.zip && \
     find LoginLdap -type d | xargs chmod 775 && \
-    find LoginLdap -type f | xargs chmod 644 && \
+    find LoginLdap -type f | xargs chmod 644 &&
     rm -f /var/www/html/plugins/LoginLdap-4.2.2.zip /var/www/html/vendor/wikimedia/less.php/bin/lessc
 
 COPY start.sh /


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]