update conpot, pull from master

docker/conpot/Dockerfile

@@ -5,8 +5,9 @@ MAINTAINER MO
 ADD dist/ /root/dist/
 
 # Setup apt
-RUN apk -U add bash \
+RUN apk -U --no-cache add bash \
                build-base \
+               cython-dev \
                file \
                git \
                libev \
@@ -18,26 +19,30 @@ RUN apk -U add bash \
                pkgconfig \
                python \
                python-dev \
-               py-cffi && \
+               py-cffi \
+               py-cryptography \
+               tcpdump \
+               wget && \
 
 # Setup ConPot
     git clone https://github.com/mushorg/conpot /opt/conpot/ && \
     cd /opt/conpot/ && \
-    git checkout d97a68a054e4fe42ff90293188a5702ce8ab09a3 && \
     cp /root/dist/requirements.txt /opt/conpot/ && \
     python setup.py install && \
     cd / && \
     rm -rf /opt/conpot /tmp/* /var/tmp/* && \
 
-# Setup user, groups and configs
-    addgroup -g 2000 conpot && \
-    adduser -S -s /bin/bash -u 2000 -D -g 2000 conpot && \
-    mkdir -p /etc/conpot /var/log/conpot && \
+# Get wireshark manuf db for scapy, setup configs, user, groups
+    mkdir -p /etc/conpot /var/log/conpot /usr/share/wireshark && \
+    wget https://github.com/wireshark/wireshark/raw/master/manuf -o /usr/share/wireshark/manuf && \
     mv /root/dist/conpot.cfg /etc/conpot/conpot.cfg && \
     mv /root/dist/kamstrup_382/template.xml /usr/lib/python2.7/site-packages/Conpot-0.5.1-py2.7.egg/conpot/templates/kamstrup_382/ && \
+    addgroup -g 2000 conpot && \
+    adduser -S -s /bin/bash -u 2000 -D -g 2000 conpot && \
 
 # Clean up
-    apk del build-base \
+    apk del --purge build-base \
+            cython-dev \
             file \
             git \
             libev \
@@ -46,7 +51,8 @@ RUN apk -U add bash \
             mariadb-dev \
             pkgconfig \
             python-dev \
-            py-cffi && \
+            py-cffi \
+            wget && \
     rm -rf /root/* && \
     rm -rf /var/cache/apk/*
 

docker/conpot/dist/requirements.txt

@@ -1,6 +1,6 @@
 gevent>=1.0
-pysnmp==4.3.5
-pysmi==0.1.3
+pysnmp
+pysmi
 lxml
 bottle
 jinja2
@@ -11,13 +11,16 @@ libtaxii>=1.1.0
 MySQL-python
 xlrd
 crc16
-enum
+natsort
+scapy
+enum34
 hpfeeds
 modbus-tk
 stix-validator
 stix
 cybox
-bacpypes==0.13.8
+bacpypes==0.16.1
 pyghmi
 mixbox
 modbus-tk
+cpppo