From 49f469239ca8037c4964c765edc82efb400e7890 Mon Sep 17 00:00:00 2001
From: rfaircloth-splunk <rfaircloth@splunk.com>
Date: Fri, 13 Dec 2019 11:38:58 -0500
Subject: [PATCH] remove rhel dev network use

---
 .circleci/config.yml     | 1 -
 .env.template            | 2 --
 docker-compose-debug.yml | 3 ---
 docker-compose-perf.yml  | 3 ---
 docker-compose.yml       | 3 ---
 5 files changed, 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8840fcf..a455417 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,7 +39,6 @@ jobs:
           image: $CI_IMAGE
           registry: $REGISTRY
           path: package
-          extra_build_args: --build-arg RH_ORG=$RH_ORG --build-arg RH_ACTIVATION=$RH_ACTIVATION
 
       - docker/install-goss:
           version: v0.3.7
diff --git a/.env.template b/.env.template
index f360cd6..b795fde 100644
--- a/.env.template
+++ b/.env.template
@@ -6,8 +6,6 @@
 #
 #You should have received a copy of the CC0 legalcode along with this
 #work.  If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-RH_ORG=xxxx
-RH_ACTIVATION=xxxxx
 SPLUNK_HEC_TOKEN=a778f63a-5dff-4e3c-a72c-a03183659e94
 SPLUNK_PASSWORD=Changed@11
 SPLUNK_START_ARGS=--accept-license
diff --git a/docker-compose-debug.yml b/docker-compose-debug.yml
index bb22763..ee8d0e0 100644
--- a/docker-compose-debug.yml
+++ b/docker-compose-debug.yml
@@ -13,9 +13,6 @@ services:
     image: splunk/scs:latest
     build:
       context: ./package
-      args:
-        RH_ORG: ${RH_ORG}
-        RH_ACTIVATION: ${RH_ACTIVATION}
     entrypoint:
       - "tail"
       - "-f"
diff --git a/docker-compose-perf.yml b/docker-compose-perf.yml
index e1bd795..b552c66 100644
--- a/docker-compose-perf.yml
+++ b/docker-compose-perf.yml
@@ -12,9 +12,6 @@ services:
     image: rfaircloth/scs:edge
     build:
       context: ./package
-      args:
-        RH_ORG: ${RH_ORG}
-        RH_ACTIVATION: ${RH_ACTIVATION}
     hostname: sc4s
     ports:
       - "514"
diff --git a/docker-compose.yml b/docker-compose.yml
index d24be63..97a759b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,9 +25,6 @@ services:
     image: splunk/scs:latest
     build:
       context: ./package
-      args:
-        RH_ORG: ${RH_ORG}
-        RH_ACTIVATION: ${RH_ACTIVATION}
     hostname: sc4s
 #When this is enabled test_common will fail
     command: -det