Merge pull request #4 from g2-inc/master

Updated to latest version after plug fest with bleach update.

base/Dockerfile_alpine

@@ -25,5 +25,4 @@ tar -C /usr/local/bin -xzvf /tmp/dockerize.tar.gz && \
 #
 # Cleanup
 apk del tar && \
-rm /var/cache/apk/* && \
-rm -rf *.tar.gz* /usr/src /root/.gnupg /tmp/*
+rm -rf /var/cache/apk/* *.tar.gz* /usr/src /root/.gnupg /tmp/*

base/Dockerfile_alpine-python3

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine
+FROM alpine:latest
 
 MAINTAINER Screaming_Bunny
 
@@ -8,16 +8,33 @@ license="BSD" \
 version="2.0" \
 description="This is the Base Alpine Python3 container for Screaming Bunny."
 
-ENV PYTHONUNBUFFERED=0
+ENV DOCKERIZE_VERSION=v0.6.1 \
+    PYTHONUNBUFFERED=0
 
 ADD modules/ /tmp/modules
+ADD https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz /tmp/dockerize.tar.gz
 ADD https://bootstrap.pypa.io/get-pip.py /tmp/get-pip.py
 
 # Package Installation
 # Packages - https://pkgs.alpinelinux.org/packages
+RUN apk upgrade --update && \
+apk add --no-cache python3 \
+  bash \
+  shadow \
+  tar \
+  dos2unix && \
+apk add --no-cache --virtual .build-deps \
+  g++ \
+  gcc \
+  musl-dev \
+  yaml-dev \
+  python3-dev && \
+#
+# Dockerize Config
+tar -C /usr/local/bin -xzvf /tmp/dockerize.tar.gz && \
 #
 # Python PIP Install
-RUN python3 /tmp/get-pip.py && \
+python3 /tmp/get-pip.py && \
 pip3 install --upgrade pip && \
 #
 # SB_Utils install
@@ -26,6 +43,7 @@ python3 setup.py install && \
 cd && \
 #
 # Cleanup
+apk del .build-deps tar && \
 rm -rf /var/cache/apk/* *.tar.gz* /usr/src /root/.gnupg /tmp/* && \
 #
 # Check versions

device-compose.log.yaml

@@ -52,12 +52,12 @@ services:
       context: ./logger/server
       dockerfile: Dockerfile
     environment:
-      ES_HOST: es_logger
+      ES_HOST: logger_elastic
       ES_PORT: 9200
       LOG_PREFIX: 'device'
       HOST_PORT: ${LOG_PORT:-514}
-      ports:
-        - 127.0.0.1:${LOG_PORT:-514}:514/udp
+    ports:
+      - 127.0.0.1:${LOG_PORT:-514}:514/udp
     volumes:
       - ./logs:/var/log/syslog
     restart: on-failure:5

environment/es_logger.env → environment/elastic.env

@@ -1,8 +1,9 @@
 # ES_Logger Variables
-cluster.name=logger
+cluster.name=orc_es01
+discovery.type=single-node
 bootstrap.memory_lock=true
 "ES_JAVA_OPTS=-Xms512m -Xmx512m"
 http.cors.enabled=true
 http.cors.allow-origin=*
 "http.cors.allow-methods=OPTIONS, HEAD, GET, POST, PUT, DELETE"
-"http.cors.allow-headers=X-Requested-With,X-Auth-Token,Content-Type, Content-Length"
+"http.cors.allow-headers=X-Requested-With,X-Auth-Token,Content-Type,Content-Length"