Merge 9706528b66 into 144bdb8315

docker/dionaea/Dockerfile

@@ -9,47 +9,36 @@ ADD dist/ /root/dist/
 RUN apt-get update -y && \
     apt-get upgrade -y && \
     apt-get install -y --no-install-recommends \
-      autoconf \
-      automake \
-      build-essential \
-      ca-certificates \
-      check \
-      cython3 \
-      git \
-      libcurl4-openssl-dev \
-      libemu-dev \
-      libev-dev \
-      libglib2.0-dev \
-      libloudmouth1-dev \
-      libnetfilter-queue-dev \
-      libnl-3-dev \
-      libpcap-dev \
-      libssl-dev \
-      libtool \
-      libudns-dev \
-      procps \
-      python3 \
-      python3-dev \
-      python3-bson \
-      python3-yaml && \
+        build-essential \
+	ca-certificates \
+	cmake \
+	check \
+	cython3 \
+	git \
+	libcurl4-openssl-dev \
+	libemu-dev \
+	libev-dev \
+	libglib2.0-dev \
+	libloudmouth1-dev \
+	libnetfilter-queue-dev \
+	libnl-3-dev \
+	libpcap-dev \
+	libssl-dev \
+	libtool \
+	libudns-dev \
+	procps \
+	python3 \
+	python3-dev \
+	python3-bson \
+	python3-yaml \
+	ttf-liberation && \
 
 # Get and install dionaea
     git clone https://github.com/dinotools/dionaea /root/dionaea/ && \
     cd /root/dionaea && \
 #    git checkout 99e9cfc88cfa8f3715813b18ec7006bca2622d76 && \
-    autoreconf -vi && \
-    ./configure \
-      --prefix=/opt/dionaea \
-      --with-python=/usr/bin/python3 \
-      --with-cython-dir=/usr/bin \
-      --enable-ev \
-      --with-ev-include=/usr/include \
-      --with-ev-lib=/usr/lib \
-      --with-emu-lib=/usr/lib/libemu \
-      --with-emu-include=/usr/include \
-      --with-nl-include=/usr/include/libnl3 \
-      --with-nl-lib=/usr/lib \
-      --enable-static && \
+    mkdir build && cd build && \
+    cmake -DCMAKE_INSTALL_PREFIX:PATH=/opt/dionaea .. && \
     make && \
     make install && \