diff --git a/docker/ciscoasa/Dockerfile b/docker/ciscoasa/Dockerfile index bc0a26b5..f1f12938 100644 --- a/docker/ciscoasa/Dockerfile +++ b/docker/ciscoasa/Dockerfile @@ -23,16 +23,16 @@ RUN apk -U upgrade && \ chown -R ciscoasa:ciscoasa /opt/ciscoasa_honeypot && \ # Clean up - apk del build-base \ - git \ - libffi-dev \ - openssl-dev \ - python3-dev && \ + apk del --purge build-base \ + git \ + libffi-dev \ + openssl-dev \ + python3-dev && \ apk add libffi \ openssl \ python3 # Start elasticsearch-head WORKDIR /opt/ciscoasa_honeypot -USER ciscoasa -CMD python3 asa_server.py --enable_ssl --verbose > /var/log/ciscoasa/ciscoasa.log 2>&1 +USER ciscoasa:ciscoasa +CMD python3 asa_server.py --enable_ssl --verbose >> /var/log/ciscoasa/ciscoasa.log 2>&1 diff --git a/docker/cowrie/Dockerfile b/docker/cowrie/Dockerfile index 6e33bde5..c8fe11c6 100644 --- a/docker/cowrie/Dockerfile +++ b/docker/cowrie/Dockerfile @@ -8,7 +8,7 @@ RUN apk -U upgrade && \ apk add build-base \ git \ gmp-dev \ - libcap \ +# libcap \ libffi-dev \ mpc1-dev \ mpfr-dev \ @@ -38,11 +38,19 @@ RUN apk -U upgrade && \ # Clean up rm -rf /root/* && \ - apk del git py-pip mpfr-dev mpc1-dev libffi-dev build-base py-mysqldb gmp-dev python-dev && \ + apk del --purge git \ + py-pip \ + mpfr-dev \ + mpc1-dev \ + libffi-dev \ + build-base \ + py-mysqldb \ + gmp-dev \ + python-dev && \ rm -rf /var/cache/apk/* # Start cowrie ENV PYTHONPATH /home/cowrie/cowrie WORKDIR /home/cowrie/cowrie -USER cowrie +USER cowrie:cowrie CMD ["/usr/bin/twistd", "--nodaemon", "-y", "cowrie.tac", "--pidfile", "var/run/cowrie.pid", "cowrie"] diff --git a/docker/cowrie/docker-compose.yml b/docker/cowrie/docker-compose.yml index cfbb272c..48dd8a31 100644 --- a/docker/cowrie/docker-compose.yml +++ b/docker/cowrie/docker-compose.yml @@ -14,8 +14,6 @@ services: restart: always networks: - cowrie_local - cap_add: - - NET_BIND_SERVICE ports: - "22:2222" - "23:2223" diff --git a/etc/compose/tpot.yml b/etc/compose/tpot.yml index 3357d058..82b201c0 100644 --- a/etc/compose/tpot.yml +++ b/etc/compose/tpot.yml @@ -36,8 +36,6 @@ services: restart: always networks: - cowrie_local - cap_add: - - NET_BIND_SERVICE ports: - "22:2222" - "23:2223"