bump cowrie to latest master, prep for rebuild

docker/cowrie/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 #
 # Include dist
 ADD dist/ /root/dist/
@@ -17,12 +17,7 @@ RUN apk -U add \
              openssl-dev \
              py3-pip \
              python3 \
-             python3-dev \
+             python3-dev && \
-	     py3-bcrypt \
-	     py3-cryptography \
-             py3-mysqlclient \
-             py3-requests \
-             py3-setuptools && \
 #
 # Setup user
     addgroup -g 2000 cowrie && \
@@ -31,11 +26,13 @@ RUN apk -U add \
 # Install cowrie
     mkdir -p /home/cowrie && \
     cd /home/cowrie && \
-    git clone --depth=1 https://github.com/micheloosterhof/cowrie -b v2.2.0 && \
+    git clone --depth=1 https://github.com/micheloosterhof/cowrie && \
     cd cowrie && \
+    git checkout 6b1e82915478292f1e77ed776866771772b48f2e && \
 #    sed -i s/logfile.DailyLogFile/logfile.LogFile/g src/cowrie/python/logfile.py && \
     mkdir -p log && \
-    cp /root/dist/requirements.txt . && \
+    sed -i '/packaging.*/d' requirements.txt && \
+    pip3 install --upgrade pip && \
     pip3 install -r requirements.txt && \
 #
 # Setup configs

docker/cowrie/dist/requirements.txt

@@ -1,14 +0,0 @@
-appdirs==1.4.4
-attrs==20.3.0
-bcrypt==3.2.0
-configparser==5.0.1
-#cryptography==3.4.5
-#packaging==20.9
-pyasn1_modules==0.2.8
-pyopenssl==20.0.1
-pyparsing==2.4.7
-python-dateutil==2.8.1
-service_identity==18.1.0
-tftpy==0.8.0
-treq==21.1.0
-twisted==20.3.0

docker/cowrie/docker-compose.yml

@@ -18,7 +18,7 @@ services:
     ports:
      - "22:22"
      - "23:23"
-    image: "ghcr.io/telekom-security/cowrie:2006"
+    image: "dtagdevsec/cowrie:2006"
     read_only: true
     volumes:
      - /data/cowrie/downloads:/home/cowrie/cowrie/dl