From 02d4d79a60759c1bc3472e36b14da3ae3655cc5c Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Sat, 5 Mar 2022 00:50:47 +0000
Subject: [PATCH] tweaking

---
 docker/adbhoney/Dockerfile       | 5 +++--
 docker/ciscoasa/Dockerfile       | 7 ++++---
 docker/citrixhoneypot/Dockerfile | 3 ++-
 docker/conpot/Dockerfile         | 5 +++--
 docker/conpot/docker-compose.yml | 4 ----
 docker/cowrie/Dockerfile         | 8 +++++---
 docker/ddospot/Dockerfile        | 3 ++-
 7 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/docker/adbhoney/Dockerfile b/docker/adbhoney/Dockerfile
index a78813b0..a6dd7fe6 100644
--- a/docker/adbhoney/Dockerfile
+++ b/docker/adbhoney/Dockerfile
@@ -1,10 +1,10 @@
 FROM alpine:3.15
 #
 # Include dist
-ADD dist/ /root/dist/
+COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk -U add \
+RUN apk --no-cache -U add \
             git \
             libcap \
 	    py3-pip \
@@ -30,6 +30,7 @@ RUN apk -U add \
     apk del --purge git \
                     python3-dev && \
     rm -rf /root/* && \
+    rm -rf /opt/adbhoney/.git && \
     rm -rf /var/cache/apk/*
 #
 # Set workdir and start adbhoney
diff --git a/docker/ciscoasa/Dockerfile b/docker/ciscoasa/Dockerfile
index 2df0c8fc..988eecfc 100644
--- a/docker/ciscoasa/Dockerfile
+++ b/docker/ciscoasa/Dockerfile
@@ -1,11 +1,11 @@
 FROM alpine:3.15
 #
 # Include dist
-ADD dist/ /root/dist/
+COPY dist/ /root/dist/
 #
 # Setup env and apt
-RUN apk -U upgrade && \
-    apk add build-base \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache add build-base \
             git \
             libffi \
             libffi-dev \
@@ -37,6 +37,7 @@ RUN apk -U upgrade && \
                     openssl-dev \
                     python3-dev && \
     rm -rf /root/* && \
+    rm -rf /opt/ciscoasa_honeypot/.git && \
     rm -rf /var/cache/apk/*
 #
 # Start ciscoasa
diff --git a/docker/citrixhoneypot/Dockerfile b/docker/citrixhoneypot/Dockerfile
index 92d8cc54..a3f871e5 100644
--- a/docker/citrixhoneypot/Dockerfile
+++ b/docker/citrixhoneypot/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.15
 #
 # Install packages
-RUN apk -U add \
+RUN apk --no-cache -U add \
             git \
             libcap \
 	    openssl \
@@ -36,6 +36,7 @@ RUN apk -U add \
                     openssl \
                     python3-dev && \
     rm -rf /root/* && \
+    rm -rf /opt/citrixhoneypot/.git && \
     rm -rf /var/cache/apk/*
 #
 # Set workdir and start citrixhoneypot
diff --git a/docker/conpot/Dockerfile b/docker/conpot/Dockerfile
index 7fdd1501..060b3672 100644
--- a/docker/conpot/Dockerfile
+++ b/docker/conpot/Dockerfile
@@ -1,11 +1,12 @@
 FROM alpine:3.15
 #
 # Include dist
-ADD dist/ /root/dist/
+COPY dist/ /root/dist/
 #
 # Setup apt
-RUN apk -U add \
+RUN apk --no-cache -U add \
              build-base \
+	     cython \
              file \
              git \
              libev \
diff --git a/docker/conpot/docker-compose.yml b/docker/conpot/docker-compose.yml
index 90e3a18d..6a76086e 100644
--- a/docker/conpot/docker-compose.yml
+++ b/docker/conpot/docker-compose.yml
@@ -42,7 +42,6 @@ services:
 
 # Conpot IEC104 service
   conpot_IEC104:
-    build: .
     container_name: conpot_IEC104
     restart: always
     environment:
@@ -65,7 +64,6 @@ services:
 
 # Conpot guardian_ast service
   conpot_guardian_ast:
-    build: .
     container_name: conpot_guardian_ast
     restart: always
     environment:
@@ -87,7 +85,6 @@ services:
 
 # Conpot ipmi
   conpot_ipmi:
-    build: .
     container_name: conpot_ipmi
     restart: always
     environment:
@@ -109,7 +106,6 @@ services:
 
 # Conpot kamstrup_382
   conpot_kamstrup_382:
-    build: .
     container_name: conpot_kamstrup_382
     restart: always
     environment:
diff --git a/docker/cowrie/Dockerfile b/docker/cowrie/Dockerfile
index 8a76363e..05c8a216 100644
--- a/docker/cowrie/Dockerfile
+++ b/docker/cowrie/Dockerfile
@@ -1,10 +1,10 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Include dist
-ADD dist/ /root/dist/
+COPY dist/ /root/dist/
 #
 # Get and install dependencies & packages
-RUN apk -U add \
+RUN apk --no-cache -U add \
              bash \
              build-base \
              git \
@@ -15,6 +15,7 @@ RUN apk -U add \
              mpfr-dev \
              openssl \
              openssl-dev \
+	     py3-mysqlclient \
              py3-pip \
              python3 \
              python3-dev && \
@@ -60,6 +61,7 @@ RUN apk -U add \
     rm -rf /root/* /tmp/* && \
     rm -rf /var/cache/apk/* && \
     rm -rf /home/cowrie/cowrie/cowrie.pid && \
+    rm -rf /home/cowrie/cowrie/.git && \
     unset PYTHON_DIR
 #
 # Start cowrie
diff --git a/docker/ddospot/Dockerfile b/docker/ddospot/Dockerfile
index cbe8cb6d..5fd7b200 100644
--- a/docker/ddospot/Dockerfile
+++ b/docker/ddospot/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.15
 #
 # Install packages
-RUN apk -U add \
+RUN apk --no-cache -U add \
              build-base \
              git \
 	     libcap \
@@ -43,6 +43,7 @@ RUN apk -U add \
                     git \
 		    python3-dev && \
     rm -rf /root/* && \
+    rm -rf /opt/ddospot/.git && \
     rm -rf /var/cache/apk/*
 #
 # Start ddospot