From bc6e94d3294e32a3bd2bdbef0224d10a9ec56e9e Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Fri, 16 Aug 2019 17:29:41 +0000
Subject: [PATCH] spiderfoot, head bump to latest master

---
 docker/elk/head/Dockerfile         | 12 ++++++------
 docker/elk/head/docker-compose.yml |  2 +-
 docker/spiderfoot/Dockerfile       | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docker/elk/head/Dockerfile b/docker/elk/head/Dockerfile
index 68120c5c..411b3b2e 100644
--- a/docker/elk/head/Dockerfile
+++ b/docker/elk/head/Dockerfile
@@ -1,33 +1,33 @@
 FROM alpine
-
+#
 # Setup env and apt
 RUN apk -U add \
             curl \
             git \
             nodejs \
             nodejs-npm && \
-
+#
 # Get and install packages
     mkdir -p /usr/src/app/ && \
     cd /usr/src/app/ && \
     git clone --depth=1 https://github.com/mobz/elasticsearch-head . && \
     npm install http-server && \
     sed -i "s#\"http\:\/\/localhost\:9200\"#window.location.protocol \+ \'\/\/\' \+ window.location.hostname \+ \'\:\' \+ window.location.port \+ \'\/es\/\'#" /usr/src/app/_site/app.js && \
-
+#
 # Setup user, groups and configs
     addgroup -g 2000 head && \
     adduser -S -H -s /bin/ash -u 2000 -D -g 2000 head && \
     chown -R head:head /usr/src/app/ && \
-
+#
 # Clean up
     apk del --purge git && \
     rm -rf /root/* && \
     rm -rf /tmp/* && \
     rm -rf /var/cache/apk/*
-
+#
 # Healthcheck
 HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9100'
-
+#
 # Start elasticsearch-head
 USER head:head
 WORKDIR /usr/src/app
diff --git a/docker/elk/head/docker-compose.yml b/docker/elk/head/docker-compose.yml
index 95c04e35..35865584 100644
--- a/docker/elk/head/docker-compose.yml
+++ b/docker/elk/head/docker-compose.yml
@@ -12,5 +12,5 @@ services:
     #        condition: service_healthy
     ports:
      - "127.0.0.1:64302:9100"
-    image: "dtagdevsec/head:1811"
+    image: "dtagdevsec/head:1903"
     read_only: true
diff --git a/docker/spiderfoot/Dockerfile b/docker/spiderfoot/Dockerfile
index fdfc40d5..548058bc 100644
--- a/docker/spiderfoot/Dockerfile
+++ b/docker/spiderfoot/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine
-
+#
 # Get and install dependencies & packages
 RUN sed -i 's/dl-cdn/dl-4/g' /etc/apk/repositories && \
     apk -U --no-cache add \
@@ -17,11 +17,11 @@ RUN sed -i 's/dl-cdn/dl-4/g' /etc/apk/repositories && \
             py-future \
             py-pip \
             swig && \
-
+#
 # Setup user
     addgroup -g 2000 spiderfoot && \
     adduser -S -s /bin/ash -u 2000 -D -g 2000 spiderfoot && \
-
+#
 # Install spiderfoot 
 #    git clone --depth=1 https://github.com/smicallef/spiderfoot -b v2.12.0-final /home/spiderfoot && \
     git clone --depth=1 https://github.com/smicallef/spiderfoot /home/spiderfoot && \
@@ -32,7 +32,7 @@ RUN sed -i 's/dl-cdn/dl-4/g' /etc/apk/repositories && \
     chown -R spiderfoot:spiderfoot /home/spiderfoot && \
     sed -i "s#'__docroot': ''#'__docroot': '\/spiderfoot'#" /home/spiderfoot/sf.py && \
     sed -i 's#raise cherrypy.HTTPRedirect("\/")#raise cherrypy.HTTPRedirect("\/spiderfoot")#' /home/spiderfoot/sfwebui.py && \
-
+#
 # Clean up
     apk del --purge build-base \
                     git \
@@ -43,10 +43,10 @@ RUN sed -i 's/dl-cdn/dl-4/g' /etc/apk/repositories && \
                     py-pip \
                     py-setuptools && \
     rm -rf /var/cache/apk/*
-
+#
 # Healthcheck
 HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:8080'
-
+#
 # Set user, workdir and start spiderfoot
 USER spiderfoot:spiderfoot
 WORKDIR /home/spiderfoot