From 96d598640764e1843ffeb785bda188b2f29be50f Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Sat, 12 Mar 2022 14:27:34 +0000
Subject: [PATCH] cowrie, test reduce build times

---
 docker/citrixhoneypot/Dockerfile    |  6 ++----
 docker/cowrie/Dockerfile            | 15 ++++++++++++++-
 docker/cowrie/dist/requirements.txt |  2 ++
 3 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 docker/cowrie/dist/requirements.txt

diff --git a/docker/citrixhoneypot/Dockerfile b/docker/citrixhoneypot/Dockerfile
index a3f871e5..b6788840 100644
--- a/docker/citrixhoneypot/Dockerfile
+++ b/docker/citrixhoneypot/Dockerfile
@@ -6,8 +6,7 @@ RUN apk --no-cache -U add \
             libcap \
 	    openssl \
             py3-pip \
-            python3 \
-            python3-dev && \
+            python3 && \
 #
     pip3 install --no-cache-dir python-json-logger && \
 #
@@ -33,8 +32,7 @@ RUN apk --no-cache -U add \
 #
 # Clean up
     apk del --purge git \
-                    openssl \
-                    python3-dev && \
+                    openssl && \
     rm -rf /root/* && \
     rm -rf /opt/citrixhoneypot/.git && \
     rm -rf /var/cache/apk/*
diff --git a/docker/cowrie/Dockerfile b/docker/cowrie/Dockerfile
index 05c8a216..a531a9f5 100644
--- a/docker/cowrie/Dockerfile
+++ b/docker/cowrie/Dockerfile
@@ -15,8 +15,20 @@ RUN apk --no-cache -U add \
              mpfr-dev \
              openssl \
              openssl-dev \
+	     py3-appdirs \
+	     py3-asn1-modules \
+	     py3-attrs \
+	     py3-bcrypt \
+	     py3-cryptography \
+	     py3-dateutil \
 	     py3-mysqlclient \
+	     py3-openssl \
+	     py3-packaging \
+	     py3-parsing \
              py3-pip \
+	     py3-service_identity \
+	     py3-treq \
+	     py3-twisted \
              python3 \
              python3-dev && \
 #
@@ -31,7 +43,8 @@ RUN apk --no-cache -U add \
     cd cowrie && \
 #    git checkout 6b1e82915478292f1e77ed776866771772b48f2e && \
     mkdir -p log && \
-    sed -i '/packaging.*/d' requirements.txt && \
+    cp /root/dist/requirements.txt . && \
+    #sed -i '/packaging.*/d' requirements.txt && \
     pip3 install --upgrade pip && \
     pip3 install -r requirements.txt && \
 #
diff --git a/docker/cowrie/dist/requirements.txt b/docker/cowrie/dist/requirements.txt
new file mode 100644
index 00000000..91efe5ff
--- /dev/null
+++ b/docker/cowrie/dist/requirements.txt
@@ -0,0 +1,2 @@
+configparser==5.2.0
+tftpy==0.8.2