From 0928e373262c05894637acb02942e729bdfffd61 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Thu, 2 Jan 2020 17:37:08 +0000
Subject: [PATCH] rebuild Dionaea, Heralding

---
 docker/dionaea/Dockerfile   | 18 +++++++++---------
 docker/heralding/Dockerfile |  8 +++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/docker/dionaea/Dockerfile b/docker/dionaea/Dockerfile
index 1e395205..cb420192 100644
--- a/docker/dionaea/Dockerfile
+++ b/docker/dionaea/Dockerfile
@@ -1,9 +1,9 @@
 FROM debian:stretch-slim
 ENV DEBIAN_FRONTEND noninteractive
-
+#
 # Include dist
 ADD dist/ /root/dist/
-
+#
 # Install dependencies and packages
 RUN apt-get update -y && \
     apt-get dist-upgrade -y && \
@@ -32,7 +32,7 @@ RUN apt-get update -y && \
 	python3-bson \
 	python3-yaml \
 	ttf-liberation && \
-
+#
 # Get and install dionaea
     git clone --depth=1 https://github.com/dinotools/dionaea -b 0.8.0 /root/dionaea/ && \
     cd /root/dionaea && \
@@ -41,17 +41,17 @@ RUN apt-get update -y && \
     cmake -DCMAKE_INSTALL_PREFIX:PATH=/opt/dionaea .. && \
     make && \
     make install && \
-
+#
 # Setup user and groups
     addgroup --gid 2000 dionaea && \
     adduser --system --no-create-home --shell /bin/bash --uid 2000 --disabled-password --disabled-login --gid 2000 dionaea && \
     setcap cap_net_bind_service=+ep /opt/dionaea/bin/dionaea && \
-
+#
 # Supply configs and set permissions
     chown -R dionaea:dionaea /opt/dionaea/var && \
     rm -rf /opt/dionaea/etc/dionaea/* && \
     mv /root/dist/etc/* /opt/dionaea/etc/dionaea/ && \
-
+#
 # Setup runtime and clean up
     apt-get purge -y \
       build-essential \
@@ -75,7 +75,7 @@ RUN apt-get update -y && \
       python3-dev \   
       python3-bson \
       python3-yaml && \ 
-
+#
     apt-get install -y \
       ca-certificates \
       python3 \
@@ -90,11 +90,11 @@ RUN apt-get update -y && \
       libpcap0.8 \
       libpython3.5 \
       libudns0 && \
-
+#
     apt-get autoremove --purge -y && \
     apt-get clean && \
     rm -rf /root/* /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
+#
 # Start dionaea
 USER dionaea:dionaea
 CMD ["/opt/dionaea/bin/dionaea", "-u", "dionaea", "-g", "dionaea", "-c", "/opt/dionaea/etc/dionaea/dionaea.cfg"]
diff --git a/docker/heralding/Dockerfile b/docker/heralding/Dockerfile
index 0618d3d0..b03a7ec0 100644
--- a/docker/heralding/Dockerfile
+++ b/docker/heralding/Dockerfile
@@ -1,10 +1,11 @@
-FROM alpine
+FROM alpine:3.10
 #  
 # Include dist
 ADD dist/ /root/dist/
 #
 # Install packages
-RUN apk -U --no-cache add \ 
+RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
+    apk -U --no-cache add \ 
             		build-base \
             		git \
             		libcap \
@@ -22,6 +23,7 @@ RUN apk -U --no-cache add \
     cd /opt/ && \
     git clone --depth=1 https://github.com/johnnykv/heralding && \
     cd heralding && \
+    sed -i 's/asyncssh/asyncssh==1.18.0/' requirements.txt && \
     pip3 install --no-cache-dir -r requirements.txt && \
     pip3 install --no-cache-dir . && \
 #
@@ -47,7 +49,7 @@ RUN apk -U --no-cache add \
            /var/cache/apk/* \
            /opt/heralding
 #
-# Start elasticpot
+# Start Heralding
 STOPSIGNAL SIGINT
 WORKDIR /tmp/heralding/
 USER heralding:heralding