Merge pull request #26 from RobertTheProfessional/upgrade/v5.5.221209

A ntopng v5.5 Builder Implementation

Dockerfile

@@ -1,13 +1,48 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
+
+RUN mkdir -p /root/packages
 
 COPY entrypoint.sh /entrypoint.sh
-COPY packages/*201206*.deb /tmp/
+COPY packages/*.deb /root/packages
 
-RUN apt-get update && apt-get --no-install-recommends -y install libsqlite3-0 libexpat1 redis-server librrd8 logrotate libcurl4 libpcap0.8 libldap-2.4-2 libhiredis0.14 \
-            libssl1.1 libmariadbd19 lsb-release tar ethtool libcap2 bridge-utils libnetfilter-conntrack3 libzstd1 libmaxminddb0 \
-            libradcli4 libjson-c3 libsnmp30 udev libzmq5 libcurl3-gnutls net-tools curl procps && rm -rf /var/lib/apt/lists/* \
-        && curl -Lo /tmp/geoipupdate_2.3.1-1_arm64.deb  http://ftp.us.debian.org/debian/pool/contrib/g/geoipupdate/geoipupdate_2.3.1-1_arm64.deb \
-        && dpkg -i /tmp/*.deb && rm /tmp/*.deb \
-        && echo "-i=br0\n-n=1\n-W=3001" >> /etc/ntopng/ntopng.conf && chmod +x /entrypoint.sh
+RUN sed -i -e's/ main/ main contrib/g' /etc/apt/sources.list && \
+    apt-get update && apt-get --no-install-recommends -y install \
+            libsqlite3-0 \
+            libexpat1 \
+            redis-server \
+            librrd8 \
+            logrotate \
+            libcurl4 \
+            libpcap0.8 \
+            libldap-2.4-2 \
+            libhiredis0.14 \
+            libssl1.0 \
+            libmariadb3 \
+            librdkafka1 \
+            whiptail \
+            libnuma1 \
+            libnetfilter-queue1 \
+            lsb-release \
+            tar \
+            ethtool \
+            libcap2 \
+            bridge-utils \
+            libnetfilter-conntrack3 \
+            libzstd1 \
+            libmaxminddb0 \
+            libradcli4 \
+            libjson-c5 \
+            libsnmp40 \
+            udev \
+            libzmq5 \
+            libcurl3-gnutls \
+            net-tools \
+            curl \
+            procps && rm -rf /var/lib/apt/lists/*
+
+RUN curl -Lo /tmp/geoipupdate_2.3.1-1_arm64.deb http://ftp.us.debian.org/debian/pool/contrib/g/geoipupdate/geoipupdate_2.3.1-1_arm64.deb
+
+RUN dpkg -i /root/packages/*.deb && mkdir -p /etc/ntopng && echo "-i=br0\n-n=1\n-W=3001" >> /etc/ntopng/ntopng.conf && chmod +x /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
+

source/Dockerfile

@@ -1,47 +1,82 @@
 #FROM arm64v8/debian:buster-slim
-FROM debian:buster-slim
+FROM debian:bullseye-slim
+
+ARG SSL_NoVerify=1
+ARG ParallelMakeJobs=1
+
+ARG nDPI_Repo=https://github.com/ntop/nDPI.git
+ARG nDPI_Branch=dev
+ARG nDPI_Commit=9f7ef723327647813a369ab55336845cc7c1b0ab
+
+ARG ntopng_Repo=https://github.com/ntop/ntopng
+ARG ntopng_Branch=dev
+ARG ntopng_Commit=c10ae0c105a4fd6983d58dcef638f2612b7b1993
 
 #ADD qemu-aarch64-static /usr/bin
 
-RUN apt-get update && apt-get --no-install-recommends -y install build-essential \
-        libtool \
+RUN apt-get update && apt install -y apt-utils && apt-get --no-install-recommends -y install \
         autoconf \
+        autogen \
         automake \
-        pkg-config \
-        wget \
-        git \
-        sudo \
-        redis-server \
-        libjson-c-dev \
-        libssl-dev \
-        libcurl4-gnutls-dev \
-        libmaxminddb-dev \
-        libsqlite3-dev \
-        libreadline-dev \
-        libxml2-dev \
-        librrd-dev \
-        linux-headers-arm64 \
-        libpcap-dev \
-        libzmq3-dev \
+        bison \
+        build-essential \
+        clang \
         debhelper \
-        fakeroot \
-        default-libmysqld-dev \
+        default-libmysqlclient-dev \
+        dkms \
         dpkg-sig \
+        fakeroot \
+        flex \
+        git \
+        gzip \
+        libcairo2-dev \
+        libcurl4-openssl-dev \
         libexpat1-dev \
-        &&  rm -rf /var/lib/apt/lists/*
+        libhiredis-dev \
+        libldap2-dev \
+        libjson-c-dev \
+        libmaxminddb-dev \
+        libnetfilter-conntrack-dev \
+        libnetfilter-queue-dev \
+        librrd-dev \
+        libpango1.0-dev \
+        libpcap-dev \
+        libpng-dev \
+        libreadline-dev \
+        libsnmp-dev \
+        libsqlite3-dev \
+        libssl-dev \
+        libtool \
+        libtool-bin \
+        libxml2-dev \
+        libzmq5-dev \
+        linux-headers-arm64 \
+        npm \
+        pkg-config \
+        redis-server \
+        rename \
+        rrdtool \
+        sudo \
+        wget \
+        zlib1g-dev \
+        && rm -rf /var/lib/apt/lists/* \
+        && npm install -g uglify-es clean-css-cli
+
 
 # build nDPI which is required by ntopng
-RUN cd /root \
-        && GIT_SSL_NO_VERIFY=1 git clone https://github.com/ntop/nDPI.git --branch 3.4; cd nDPI; ./autogen.sh; make -j4
+RUN cd /root && GIT_SSL_NO_VERIFY=$SSL_NoVerify git clone $nDPI_Repo --branch $nDPI_Branch
+RUN cd /root/nDPI && git checkout $nDPI_Commit && ./autogen.sh && ./configure && make -j$ParallelMakeJobs
 
 
 # build ntopng
-RUN cd /root \
-        && GIT_SSL_NO_VERIFY=1 git clone https://github.com/ntop/ntopng --branch 4.2 \
-        && cd ntopng \
-        && ./autogen.sh \
-        && ./configure \
-        && make -j4 \
+RUN cd /root && GIT_SSL_NO_VERIFY=$SSL_NoVerify git clone $ntopng_Repo --branch $ntopng_Branch
+RUN cd /root/ntopng && git checkout $ntopng_Commit && ./autogen.sh && ./configure && make -j$ParallelMakeJobs
+
+RUN mkdir -p /root/dat_files && cd /root/dat_files && \
+    wget https://download.db-ip.com/free/dbip-country-lite-$(date +"%Y-%m").mmdb.gz && \
+    wget https://download.db-ip.com/free/dbip-city-lite-$(date +"%Y-%m").mmdb.gz && \
+    wget https://download.db-ip.com/free/dbip-asn-lite-$(date +"%Y-%m").mmdb.gz && \
+    gunzip ./*
 
 # build deb packages
 # This requires you have a .gnupg directory present as the Makefile will try to sign all the deb packages
@@ -49,4 +84,10 @@ RUN cd /root \
 #
 # This last is currently commented since the automatic package builder does not detect the debian 10 buster container and inserts the wrong dependacies in 
 # ntopng/packages/debian/debian.ntopng
-#RUN cd packages/ubuntu && ./configure && make
+RUN cd /root/ntopng/packages/debian && \
+            ./configure && \
+            sed -i '/dpkg-sig/s//#&/' Makefile && \
+            make && \
+            mkdir -p debs && \
+            mv *.deb debs
+

source/build.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -z $DOCKER_IMAGE ]; then
+    printf "Specify the Docker Image with the DOCKER_IMAGE environment variable"
+    return 1
+fi
+
+docker buildx build --platform linux/arm64 -t "$DOCKER_IMAGE" --load .
+