update conpot, pull from master

This commit is contained in:
Marco Ochse 2018-02-27 17:49:58 +00:00
parent 7a507156bd
commit fc0f3ad0fb
2 changed files with 22 additions and 13 deletions

View file

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

View file

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