From 5c155c602ffa3a02c09ecd1a246dec9be75e2011 Mon Sep 17 00:00:00 2001 From: surtur Date: Fri, 7 May 2021 03:28:19 +0200 Subject: [PATCH 1/2] feat: use dev branch of nDPI --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0f8d76e..7c76398 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,7 +53,6 @@ RUN bash -c 'export MAKEFLAGS="$MAKEFLAGS -j$(nproc)" && printf "$MAKEFLAGS\n"; export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/sbin:$PATH"; \ git clone https://github.com/ntop/nDPI.git /tmp/nDPI && \ cd /tmp/nDPI ; \ - git checkout 1.7 && \ ./autogen.sh && \ ./configure && \ make && \ -- 2.48.1 From 7bf51a3c93b73b65e53cec13bee0ebcb6c3a7e0e Mon Sep 17 00:00:00 2001 From: surtur Date: Fri, 7 May 2021 04:01:14 +0200 Subject: [PATCH 2/2] ndpi: actually build both 1.7 and dev --- Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7c76398..76edfa7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,6 +53,13 @@ RUN bash -c 'export MAKEFLAGS="$MAKEFLAGS -j$(nproc)" && printf "$MAKEFLAGS\n"; export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/sbin:$PATH"; \ git clone https://github.com/ntop/nDPI.git /tmp/nDPI && \ cd /tmp/nDPI ; \ + git checkout 1.7; \ + ./autogen.sh && \ + ./configure && \ + make && \ + make install && \ + make clean && \ + git switch - ; \ ./autogen.sh && \ ./configure && \ make && \ -- 2.48.1