From 13b93fb12496b054c8e44b48f318de9c09a6e3a4 Mon Sep 17 00:00:00 2001
From: Ryan Faircloth <rfaircloth@splunk.com>
Date: Sat, 29 Jun 2019 22:56:10 -0400
Subject: [PATCH] env shift

---
 .env.template      | 10 ++++++++++
 docker-compose.yml | 28 +++++++++++++++++-----------
 tests/Dockerfile   |  2 +-
 tests/test_poc.py  |  1 -
 4 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 .env.template

diff --git a/.env.template b/.env.template
new file mode 100644
index 0000000..dd14966
--- /dev/null
+++ b/.env.template
@@ -0,0 +1,10 @@
+RH_ORG=xxxx
+RH_ACTIVATION=xxxxx
+SPLUNK_HEC_TOKEN=a778f63a-5dff-4e3c-a72c-a03183659e94
+SPLUNK_PASSWORD=Changed@11
+SPLUNK_START_ARGS=--accept-license
+SPLUNK_HEC_URL=https://splunk:8088/services/collector/event
+SPLUNK_HEC_STATSURL=https://splunk:8088/services/collector/event
+SPLUNK_CONNECT_METHOD=hec
+SPLUNK_DEFAULT_INDEX=main
+SPLUNK_METRICS_INDEX=metrics
diff --git a/docker-compose.yml b/docker-compose.yml
index 461faf4..829b864 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,10 +8,16 @@ services:
     volumes:
       - sc4s-tests:/work/tests
       - sc4s-results:/work/test-results
+    environment:
+      - SPLUNK_PASSWORD
 
   sc4s:
-    image: rfaircloth/scs:master
-    build: ./package
+#    image: rfaircloth/scs:latest
+    build:
+      context: ./package
+      args:
+        RH_ORG: $RH_ORG
+        RH_ACTIVATION: $RH_ACTIVATION
     hostname: sc4s
     ports:
       - "514"
@@ -24,12 +30,12 @@ services:
     links:
       - splunk
     environment:
-      - SPLUNK_HEC_URL=https://splunk:8088/services/collector/event
-      - SPLUNK_HEC_STATSURL=https://splunk:8088/services/collector/event
-      - SPLUNK_HEC_TOKEN=a778f63a-5dff-4e3c-a72c-a03183659e94
-      - SPLUNK_CONNECT_METHOD=hec
-      - SPLUNK_DEFAULT_INDEX=main
-      - SPLUNK_METRICS_INDEX=metrics
+      - SPLUNK_HEC_URL
+      - SPLUNK_HEC_STATSURL
+      - SPLUNK_HEC_TOKEN
+      - SPLUNK_CONNECT_METHOD
+      - SPLUNK_DEFAULT_INDEX
+      - SPLUNK_METRICS_INDEX
 #    logging:
 #      driver: splunk
 #      options:
@@ -46,9 +52,9 @@ services:
       - "8088:8088"
       - "8089:8089"
     environment:
-      - SPLUNK_HEC_TOKEN=a778f63a-5dff-4e3c-a72c-a03183659e94
-      - SPLUNK_PASSWORD=Changed@11
-      - SPLUNK_START_ARGS=--accept-license
+      - SPLUNK_HEC_TOKEN
+      - SPLUNK_PASSWORD
+      - SPLUNK_START_ARGS
 #    logging:
 #      driver: splunk
 #      options:
diff --git a/tests/Dockerfile b/tests/Dockerfile
index 99b98a6..36fa35e 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -5,5 +5,5 @@ COPY requirements.txt /
 RUN pip3 install -r /requirements.txt
 RUN mkdir -p /work/tests
 RUN mkdir -p /work/test-results/functional
-WORKDIR /work
+#WORKDIR /work
 CMD cd /work;python -m pytest --junitxml=/work/test-results/functional/functional.xml
diff --git a/tests/test_poc.py b/tests/test_poc.py
index 9e71e4a..986c2a3 100644
--- a/tests/test_poc.py
+++ b/tests/test_poc.py
@@ -50,7 +50,6 @@ def sendsingle(message):
             if tried > 90:
                 raise
             sleep(1)
-
     sock.sendall(str.encode(message))
     sock.close()