prep for 18.04

docker/honeytrap/Dockerfile

@@ -1,6 +1,4 @@
 FROM debian:stretch-slim 
-MAINTAINER MO
-
 ENV DEBIAN_FRONTEND noninteractive
 
 # Include dist
@@ -11,8 +9,19 @@ RUN apt-get update -y && \
     apt-get dist-upgrade -y && \
 
 # Install packages
-    apt-get install -y autoconf build-essential git iptables libnetfilter-queue1 libnetfilter-queue-dev \
-                       libjson-c-dev libtool libpq5 libpq-dev netbase procps wget && \
+    apt-get install -y autoconf \
+                       build-essential \
+                       git \
+                       iptables \
+                       libnetfilter-queue1 \
+                       libnetfilter-queue-dev \
+                       libjson-c-dev \
+                       libtool \
+                       libpq5 \
+                       libpq-dev \
+                       netbase \
+                       procps \
+                       wget && \
 
 # Install honeytrap from source
     cd /root/ && \
@@ -36,7 +45,11 @@ RUN apt-get update -y && \
 
 # Clean up
     rm -rf /root/* && \
-    apt-get purge -y autoconf build-essential git libnetfilter-queue-dev libpq-dev && \
+    apt-get purge -y autoconf \
+                     build-essential \
+                     git \
+                     libnetfilter-queue-dev \
+                     libpq-dev && \
     apt-get autoremove -y --purge && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 

docker/honeytrap/README.md

@@ -1,4 +1,4 @@
-[![](https://images.microbadger.com/badges/version/dtagdevsec/honeytrap:1710.svg)](https://microbadger.com/images/dtagdevsec/honeytrap:1710 "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/dtagdevsec/honeytrap:1710.svg)](https://microbadger.com/images/dtagdevsec/honeytrap:1710 "Get your own image badge on microbadger.com")
+[![](https://images.microbadger.com/badges/version/dtagdevsec/honeytrap:1804.svg)](https://microbadger.com/images/dtagdevsec/honeytrap:1804 "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/dtagdevsec/honeytrap:1804.svg)](https://microbadger.com/images/dtagdevsec/honeytrap:1804 "Get your own image badge on microbadger.com")
 
 # honeytrap
 

docker/honeytrap/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2.1'
+version: '2.2'
 
 networks:
   honeytrap_local:
@@ -7,12 +7,13 @@ services:
 
 # Honeytrap service
   honeytrap:
+    build: .
     container_name: honeytrap
     restart: always
     network_mode: "host"
     cap_add:
      - NET_ADMIN
-    image: "dtagdevsec/honeytrap:1710"
+    image: "dtagdevsec/honeytrap:1804"
     volumes:
      - /data/honeytrap/attacks:/opt/honeytrap/var/attacks
      - /data/honeytrap/downloads:/opt/honeytrap/var/downloads