From 8f38c19cea3e3efcfe026be70437f0983309b79f Mon Sep 17 00:00:00 2001
From: Ryan Faircloth <35384120+rfaircloth-splunk@users.noreply.github.com>
Date: Wed, 21 Aug 2019 20:55:37 -0400
Subject: [PATCH 01/29] Release to correct build (#55)

Mid point release to tag for proper latest
---
 .circleci/config.yml   | 90 +++++++++++++++++++++++++++++++-----------
 CONTRIBUTING.md        | 14 ++++++-
 clair-whitelist.yml    |  4 ++
 docker-compose-ci.yml  | 78 ++++++++++++++++++++++++++++++++++++
 docker-compose.yml     |  4 +-
 docs/gettingstarted.md |  2 +-
 package/Dockerfile     |  5 +--
 7 files changed, 167 insertions(+), 30 deletions(-)
 create mode 100644 docker-compose-ci.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1dedbc9..aa9293b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,19 +28,10 @@ jobs:
           command: docker login -u $DOCKER_USER -p $DOCKER_PASS
       - run:
           name: Build Docker image
-          command: docker build -f package/Dockerfile --build-arg RH_ORG=$RH_ORG --build-arg RH_ACTIVATION=$RH_ACTIVATION -t $IMAGE_NAME:build package
-      - run:
-          name: Tag Docker image
-          command: docker tag $IMAGE_NAME:build $IMAGE_NAME:$CIRCLE_SHA1
-      - run:
-          name: Tag Docker image
-          command: docker tag $IMAGE_NAME:build $IMAGE_NAME:edge
+          command: docker build -f package/Dockerfile --build-arg RH_ORG=$RH_ORG --build-arg RH_ACTIVATION=$RH_ACTIVATION -t $IMAGE_NAME:$CIRCLE_SHA1 package
       - run:
           name: Push Docker image
           command: docker push $IMAGE_NAME:$CIRCLE_SHA1
-      - run:
-          name: Push Docker image
-          command: docker push $IMAGE_NAME:edge
   build-egb:
     environment:
       IMAGE_NAME: rfaircloth/scs
@@ -57,13 +48,10 @@ jobs:
           command: docker login -u $DOCKER_USER -p $DOCKER_PASS
       - run:
           name: Build Docker image
-          command: docker build -f perftests/bundlesrv/Dockerfile  -t $IMAGE_NAME:egb-build perftests/bundlesrv
-      - run:
-          name: Tag Docker image
-          command: docker tag $IMAGE_NAME:egb-build $IMAGE_NAME:egb-$CIRCLE_SHA1
+          command: docker build -f perftests/bundlesrv/Dockerfile  -t $IMAGE_NAME:egb-$CIRCLE_SHA1 perftests/bundlesrv
       - run:
           name: Tag Docker image
-          command: docker tag $IMAGE_NAME:egb-build $IMAGE_NAME:egb-edge
+          command: docker tag $IMAGE_NAME:egb-$CIRCLE_SHA1 $IMAGE_NAME:egb-edge
       - run:
           name: Push Docker image
           command: docker push $IMAGE_NAME:egb-$CIRCLE_SHA1
@@ -135,13 +123,13 @@ jobs:
                     registry.access.redhat.com/ubi7/ubi
             docker cp tests/ dummy:/work/tests/
             docker rm dummy
-      - run:
-          name: Docker Compose build
-          command: |
-            docker-compose build
+#      - run:
+#          name: Docker Compose build
+#          command: |
+#            docker-compose build
       - run:
           name: Docker Compose up
-          command: docker-compose up  --abort-on-container-exit
+          command: docker-compose  -f ./docker-compose-ci.yml up --abort-on-container-exit
       - run:
           name: Collect test results from Docker Compose
           command: |
@@ -174,7 +162,7 @@ jobs:
     - store_artifacts:
         path: /clair-reports
 
-  publish:
+  publish-common:
     environment:
       IMAGE_NAME: rfaircloth/scs
     docker:
@@ -195,6 +183,48 @@ jobs:
           name: Docker push tag
           command: docker push $IMAGE_NAME:$CIRCLE_BRANCH
 
+  publish-edge:
+    environment:
+      IMAGE_NAME: rfaircloth/scs
+    docker:
+      - image: circleci/buildpack-deps:stretch
+    steps:
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - run:
+          name: Docker Login
+          command: docker login -u $DOCKER_USER -p $DOCKER_PASS
+      - run:
+          name: Docker pull
+          command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
+      - run:
+          name: Docker tag image
+          command: docker tag $IMAGE_NAME:$CIRCLE_SHA1 $IMAGE_NAME:edge
+      - run:
+          name: Docker push tag
+          command: docker push $IMAGE_NAME:edge
+
+  publish-latest:
+    environment:
+      IMAGE_NAME: rfaircloth/scs
+    docker:
+      - image: circleci/buildpack-deps:stretch
+    steps:
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - run:
+          name: Docker Login
+          command: docker login -u $DOCKER_USER -p $DOCKER_PASS
+      - run:
+          name: Docker pull
+          command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
+      - run:
+          name: Docker tag image
+          command: docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:latest
+      - run:
+          name: Docker push tag
+          command: docker push splunk/scs:latest
+
 workflows:
   build-publish:
     jobs:
@@ -209,7 +239,7 @@ workflows:
       - test-scan_images:
           requires:
             - build
-      - publish:
+      - publish-common:
           requires:
             - dgoss
             - test-unit
@@ -218,3 +248,19 @@ workflows:
               only:
                 - master
                 - develop
+      - publish-edge:
+          requires:
+            - dgoss
+            - test-unit
+          filters:
+            branches:
+              only:
+                - develop
+      - publish-latest:
+          requires:
+            - dgoss
+            - test-unit
+          filters:
+            branches:
+              only:
+                - master
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 335ef34..85546be 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -95,6 +95,16 @@ available at [http://contributor-covenant.org/version/1/4][version]
 
 Use project issue tracker
 
-## Contributing code
+## Contributing code or data
 
-Future Docs
\ No newline at end of file
+Future Docs covering the contribution process and requirements
+
+By submitting a Contribution to this Work, You agree that Your Contribution is made subject to the license files applicable to this Work. Contributions comprising code shall be made pursuant the BSD2 license; Contributions consisting of configuration information or data shall be made pursuant to the CCO license. In addition, You represent that:  You are the copyright owner of the Contribution or (ii) You have the requisite rights to make the Contribution.
+
+Definitions:
+
+“You” shall mean:  yourself if you are making a Contribution on your own behalf; or (ii) your company, if you are making a Contribution on behalf of your company. If you are making a Contribution on behalf of your company, you represent that you have the requisite authority to do so.
+
+"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You for inclusion in, or documentation of, this project/repository. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication submitted for inclusion in this project/repository, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the maintainers of the project/repository.
+
+“Work” shall mean the collective software, data, content, and documentation in this project/repository.
diff --git a/clair-whitelist.yml b/clair-whitelist.yml
index 979a352..586bcb7 100644
--- a/clair-whitelist.yml
+++ b/clair-whitelist.yml
@@ -15,6 +15,10 @@ generalwhitelist:
     RHSA-2018:2772: False Positive
     RHSA-2018:1374: False Positive
     RHSA-2018:0180: False Positive
+    RHSA-2019:2029: False Positive
+    RHSA-2019:1873: False Positive
+
+
 
 images:
     scs:
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
new file mode 100644
index 0000000..b7dbd53
--- /dev/null
+++ b/docker-compose-ci.yml
@@ -0,0 +1,78 @@
+#Splunk Connect for Syslog (SC4S) by Splunk, Inc.
+#
+#To the extent possible under law, the person who associated CC0 with
+#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights
+#to Splunk Connect for Syslog (SC4S).
+#
+#You should have received a copy of the CC0 legalcode along with this
+#work.  If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+version: "3.2"
+services:
+  test:
+    build: ./tests
+    links:
+      - splunk
+      - sc4s
+    volumes:
+      - sc4s-tests:/work/tests
+      - sc4s-results:/work/test-results
+    environment:
+      - SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
+
+  sc4s:
+    image: rfaircloth/scs:${CIRCLE_SHA1}
+    hostname: sc4s
+    ports:
+      - "514"
+      - "601"
+      - "514/udp"
+      - "5514"
+      - "5514/udp"
+    stdin_open: true
+    tty: true
+    links:
+      - splunk
+    environment:
+      - SPLUNK_HEC_URL=${SPLUNK_HEC_URL}
+      - SPLUNK_HEC_STATSURL=${SPLUNK_HEC_STATSURL}
+      - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
+      - SPLUNK_CONNECT_METHOD=${SPLUNK_CONNECT_METHOD}
+      - SPLUNK_DEFAULT_INDEX=${SPLUNK_DEFAULT_INDEX}
+      - SPLUNK_METRICS_INDEX=${SPLUNK_DEFAULT_INDEX}
+#    logging:
+#      driver: splunk
+#      options:
+#        splunk-token: a778f63a-5dff-4e3c-a72c-a03183659e94
+#        splunk-url: https://splunk:8088/services/collector/event
+#        splunk-index: main
+#        splunk-insecureskipverify: true
+#        splunk-verify-connection: false
+  splunk:
+    image: splunk/splunk:latest
+    hostname: splunk
+    ports:
+      - "8000:8000"
+      - "8088:8088"
+      - "8089:8089"
+    environment:
+      - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
+      - SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
+      - SPLUNK_START_ARGS=${SPLUNK_START_ARGS}
+      - SPLUNK_APPS_URL=${SPLUNK_APPS_URL}
+      - SPLUNKBASE_USERNAME=${SPLUNKBASE_USERNAME}
+      - SPLUNKBASE_PASSWORD=${SPLUNKBASE_PASSWORD}
+    volumes:
+      - ./splunk/SA-syslog-ng:/opt/splunk/etc/apps/SA-syslog-ng
+#    logging:
+#      driver: splunk
+#      options:
+#        splunk-token: a778f63a-5dff-4e3c-a72c-a03183659e94
+#        splunk-url: https://splunk:8088/services/collector/event
+#        splunk-index: main
+#        splunk-insecureskipverify: true
+#        splunk-verify-connection: false
+volumes:
+  sc4s-tests:
+    external: true
+  sc4s-results:
+    external: true
diff --git a/docker-compose.yml b/docker-compose.yml
index f13c181..fd562ee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@
 #
 #You should have received a copy of the CC0 legalcode along with this
 #work.  If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-version: "3"
+version: "3.2"
 services:
   test:
     build: ./tests
@@ -20,7 +20,7 @@ services:
       - SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
 
   sc4s:
-    image: rfaircloth/scs:latest
+    image: splunk/scs:latest
     build:
       context: ./package
       args:
diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
index 2d7c971..d1e71cc 100644
--- a/docs/gettingstarted.md
+++ b/docs/gettingstarted.md
@@ -19,7 +19,7 @@
 version: "3"
 services:
   sc4s:
-    image: rfaircloth/scs:latest
+    image: splunk/scs:latest
     hostname: sc4s
     ports:
       - "514"
diff --git a/package/Dockerfile b/package/Dockerfile
index 7c47a5a..2f8698e 100644
--- a/package/Dockerfile
+++ b/package/Dockerfile
@@ -11,14 +11,13 @@ FROM registry.access.redhat.com/rhel7/rhel
 ARG RH_ORG
 ARG RH_ACTIVATION
 
-ENV           CONFIGURE_FLAGS="--prefix=/opt/syslog-ng --with-ivykis=system --with-jsonc=system --disable-env-wrapper --disable-memtrace --enable-tcp-wrapper --disable-linux-caps --disable-man-pages --enable-all-modules --enable-force-gnu99 --enable-json --enable-native --enable-python --enable-http --enable-kafka --disable-java --disable-java-modules --disable-spoof_source --disable-sun_streams --disable-sql --disable-pacct --disable-mongodb --disable-amqp --disable-stomp --disable-redis --disable-systemd --disable-geoip --disable-geoip2 --disable-riemann --disable-smtp --disable-snmp_dest --with-python=3 --enable-dynamic-linking"
+ENV CONFIGURE_FLAGS="--prefix=/opt/syslog-ng --with-ivykis=system --with-jsonc=system --disable-env-wrapper --disable-memtrace --enable-tcp-wrapper --disable-linux-caps --disable-man-pages --enable-all-modules --enable-force-gnu99 --enable-json --enable-native --enable-python --enable-http --enable-kafka --disable-java --disable-java-modules --disable-spoof_source --disable-sun_streams --disable-sql --disable-pacct --disable-mongodb --disable-amqp --disable-stomp --disable-redis --disable-systemd --disable-geoip --disable-geoip2 --disable-riemann --disable-smtp --disable-snmp_dest --with-python=3 --enable-dynamic-linking"
 
 ENV DISTCHECK_CONFIGURE_FLAGS="--prefix=/opt/syslog-ng --with-ivykis=system --with-jsonc=system --disable-env-wrapper --disable-memtrace --enable-tcp-wrapper --disable-linux-caps --disable-man-pages --enable-all-modules --enable-force-gnu99 --enable-json --enable-native --enable-python --enable-http --enable-kafka --disable-java --disable-java-modules --disable-spoof_source --disable-sun_streams --disable-sql --disable-pacct --disable-mongodb --disable-amqp --disable-stomp --disable-redis --disable-systemd --disable-geoip --disable-geoip2 --disable-riemann --disable-smtp --disable-snmp_dest --with-python=3 --enable-dynamic-linking"
 COPY confluent.repo /etc/yum.repos.d/confluent.repo
 RUN subscription-manager register --org=$RH_ORG --activationkey=$RH_ACTIVATION --force
 RUN subscription-manager repos --enable=rhel-7-server-extras-rpms --enable=rhel-7-server-optional-rpms --enable=rhel-server-rhscl-7-rpms
-RUN subscription-manager repos --enable "rhel-*-optional-rpms" --enable "rhel-*-extras-rpms"  --enable "rhel-ha-for-rhel-*-server-rpms"
-RUN yum install wget -y
+RUN yum update -y; yum install wget -y
 RUN rpm --import https://packages.confluent.io/rpm/5.2/archive.key
 RUN cd /tmp ;\
     wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm ;\

From a5424cea56f88cc5564d49bad354c074df338842 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 09:09:48 -0400
Subject: [PATCH 02/29] Update config.yml

---
 .circleci/config.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 89d1e1f..c2c4ea4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -210,6 +210,28 @@ jobs:
           name: Docker push tag
           command: docker push $IMAGE_NAME:edge
 
+  publish-version:
+    environment:
+      IMAGE_NAME: rfaircloth/scs
+    docker:
+      - image: circleci/buildpack-deps:stretch
+    steps:
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - run:
+          name: Docker Login
+          command: docker login -u $DOCKER_USER -p $DOCKER_PASS
+      - run:
+          name: Docker pull
+          command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
+      - run:
+          name: Docker tag image
+          command: |
+            SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo | jq '.["SemVer"]' | sed s/\"//g)
+            docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$SEMVER
+      - run:
+          name: Docker push tag
+          command: docker push splunk/scs:$SEMVER
   publish-latest:
     environment:
       IMAGE_NAME: rfaircloth/scs
@@ -262,6 +284,14 @@ workflows:
             branches:
               only:
                 - develop
+      - publish-version:
+          requires:
+            - dgoss
+            - test-unit
+          filters:
+            branches:
+              only:
+                - master
       - publish-latest:
           requires:
             - dgoss

From 715556601a35bdba88c60690357c9cc541ec6caf Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 09:12:47 -0400
Subject: [PATCH 03/29] Add change log

---
 .circleci/config.yml | 1 +
 CHANGELOG            | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 CHANGELOG

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c2c4ea4..878541d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -292,6 +292,7 @@ workflows:
             branches:
               only:
                 - master
+                - release/*
       - publish-latest:
           requires:
             - dgoss
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..4b84880
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,6 @@
+0.4.0
+    - Add source support for Cisco NX
+    - Add source support for Symantec Proxy SG and ASG (Formerly bluecoat)
+    - Add support for mapping network source IP OR parsed host to specific vendor product where MSG parsing is impossible
+    - Code cleanup and simplification
+    - Begin using SEMVER for releases
\ No newline at end of file

From c4aff3a8a05141f561ebb256b1d25f24945ef55c Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 09:21:09 -0400
Subject: [PATCH 04/29] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 878541d..f1e8489 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -292,7 +292,7 @@ workflows:
             branches:
               only:
                 - master
-                - release/*
+                - release/\d+\.\d+\.\d+
       - publish-latest:
           requires:
             - dgoss

From 7fd7e03862c4a6fec4edeb2b72329c8ebb02c745 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 09:23:55 -0400
Subject: [PATCH 05/29] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f1e8489..21efba2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -292,7 +292,7 @@ workflows:
             branches:
               only:
                 - master
-                - release/\d+\.\d+\.\d+
+                - release\/.*
       - publish-latest:
           requires:
             - dgoss

From 22ed2658f31f22129bc615634e0069ed313568b2 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 09:27:38 -0400
Subject: [PATCH 06/29] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 21efba2..85289b8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -292,7 +292,7 @@ workflows:
             branches:
               only:
                 - master
-                - release\/.*
+                - /^release\/.*/
       - publish-latest:
           requires:
             - dgoss

From 2e3d912d8424871bf3279a35f5611a7346803a74 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 09:37:14 -0400
Subject: [PATCH 07/29] Update config.yml

---
 .circleci/config.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 85289b8..b027082 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -228,6 +228,8 @@ jobs:
           name: Docker tag image
           command: |
             SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo | jq '.["SemVer"]' | sed s/\"//g)
+            echo $SEMVER
+            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo             
             docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$SEMVER
       - run:
           name: Docker push tag
@@ -291,8 +293,8 @@ workflows:
           filters:
             branches:
               only:
-                - master
-                - /^release\/.*/
+#                - master
+#                - /^release\/.*/
       - publish-latest:
           requires:
             - dgoss

From 36b52e97356de4fb45bf4fb914da7abb04b440d3 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 09:40:54 -0400
Subject: [PATCH 08/29] Update config.yml

---
 .circleci/config.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b027082..e602483 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -229,7 +229,7 @@ jobs:
           command: |
             SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo | jq '.["SemVer"]' | sed s/\"//g)
             echo $SEMVER
-            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo             
+            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo | jq '.["SemVer"]' | sed s/\"//g
             docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$SEMVER
       - run:
           name: Docker push tag
@@ -288,13 +288,14 @@ workflows:
                 - develop
       - publish-version:
           requires:
-            - dgoss
-            - test-unit
+            - build
+#            - dgoss
+#            - test-unit
           filters:
             branches:
               only:
-#                - master
-#                - /^release\/.*/
+                - master
+                - /^release\/.*/
       - publish-latest:
           requires:
             - dgoss

From 4931972535e80995d12bcdcd5fb39471b9ca8f6d Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 09:44:24 -0400
Subject: [PATCH 09/29] Update config.yml

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e602483..32271e7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -217,6 +217,7 @@ jobs:
       - image: circleci/buildpack-deps:stretch
     steps:
       - setup_remote_docker:
+          version: 18.09.3
           docker_layer_caching: true
       - run:
           name: Docker Login

From 6d0586e6b8bad1e97f0288a085d59fd52e728dfc Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 09:53:42 -0400
Subject: [PATCH 10/29] Update config.yml

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 32271e7..7b34003 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -228,9 +228,9 @@ jobs:
       - run:
           name: Docker tag image
           command: |
-            SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo | jq '.["SemVer"]' | sed s/\"//g)
+            SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer)
             echo $SEMVER
-            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo | jq '.["SemVer"]' | sed s/\"//g
+            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
             docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$SEMVER
       - run:
           name: Docker push tag

From 829526223092db36d5f7fa22b80dca8be7a2a202 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 09:56:09 -0400
Subject: [PATCH 11/29] Update config.yml

---
 .circleci/config.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7b34003..fcbfc4a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -229,8 +229,6 @@ jobs:
           name: Docker tag image
           command: |
             SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer)
-            echo $SEMVER
-            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
             docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$SEMVER
       - run:
           name: Docker push tag

From 4e0f4a25cc198a492288ee25ba98251edb49a5d2 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 10:01:12 -0400
Subject: [PATCH 12/29] Update config.yml

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fcbfc4a..ad816ca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -216,6 +216,7 @@ jobs:
     docker:
       - image: circleci/buildpack-deps:stretch
     steps:
+      - checkout
       - setup_remote_docker:
           version: 18.09.3
           docker_layer_caching: true
@@ -228,11 +229,10 @@ jobs:
       - run:
           name: Docker tag image
           command: |
-            SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer)
-            docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$SEMVER
+            docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer)
       - run:
           name: Docker push tag
-          command: docker push splunk/scs:$SEMVER
+          command: docker push splunk/scs:$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer)
   publish-latest:
     environment:
       IMAGE_NAME: rfaircloth/scs

From b7e14069ee8618e9bf07fecb0991c41fa5f5ae5e Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 10:07:16 -0400
Subject: [PATCH 13/29] Update config.yml

---
 .circleci/config.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ad816ca..fd5c4f9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -229,10 +229,12 @@ jobs:
       - run:
           name: Docker tag image
           command: |
-            docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer)
+            SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer)
+            echo $SEMVER
+            docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$SEMVER
       - run:
           name: Docker push tag
-          command: docker push splunk/scs:$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer)
+          command: docker push splunk/scs:
   publish-latest:
     environment:
       IMAGE_NAME: rfaircloth/scs

From db9724c95f68d2314768f16e6fca47f81787381d Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 10:11:14 -0400
Subject: [PATCH 14/29] Update config.yml

---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fd5c4f9..1764e47 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -234,7 +234,10 @@ jobs:
             docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$SEMVER
       - run:
           name: Docker push tag
-          command: docker push splunk/scs:
+          command: |
+            SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer)
+            echo $SEMVER
+            docker push splunk/scs:$SEMVER
   publish-latest:
     environment:
       IMAGE_NAME: rfaircloth/scs

From 389558e4c7eb3b93a9c9a7263486fc547ee30f01 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 10:17:31 -0400
Subject: [PATCH 15/29] Update config.yml

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1764e47..41584a3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -226,6 +226,7 @@ jobs:
       - run:
           name: Docker pull
           command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
+      - run: docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
       - run:
           name: Docker tag image
           command: |

From 0ebd8e0f1f7e11e45e497e082858901bc9f1def5 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 10:30:08 -0400
Subject: [PATCH 16/29] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 41584a3..4c73cf7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -226,7 +226,7 @@ jobs:
       - run:
           name: Docker pull
           command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
-      - run: docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
+      - run: docker run --rm -v ".:/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
       - run:
           name: Docker tag image
           command: |

From a007f060343e19579235b6f50c4aa67ed23496b4 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 10:32:25 -0400
Subject: [PATCH 17/29] Update config.yml

---
 .circleci/config.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4c73cf7..cc76af7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -226,7 +226,11 @@ jobs:
       - run:
           name: Docker pull
           command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
-      - run: docker run --rm -v ".:/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
+      - run:
+          command: |
+            ls -la
+            pwd
+            docker run --rm -v ".:/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
       - run:
           name: Docker tag image
           command: |

From 352e2f019c642afeed19ce3c1d68a74267629588 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 10:37:28 -0400
Subject: [PATCH 18/29] Update config.yml

---
 .circleci/config.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cc76af7..b53ed43 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -228,9 +228,7 @@ jobs:
           command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
       - run:
           command: |
-            ls -la
-            pwd
-            docker run --rm -v ".:/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
+            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
       - run:
           name: Docker tag image
           command: |

From eb426dbf5fbc574ab65e1be0b69a247463156a62 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 10:39:25 -0400
Subject: [PATCH 19/29] Update config.yml

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b53ed43..cec5c93 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -228,6 +228,8 @@ jobs:
           command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
       - run:
           command: |
+            git fetch --tags --prune --progress --no-recurse-submodules origin
+            git checkout --progress --force $CIRCLE_SHA1
             docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
       - run:
           name: Docker tag image

From 42728da1e0ec8e02f56ec6deb85b215f97ed2889 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 10:53:30 -0400
Subject: [PATCH 20/29] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cec5c93..44eb3d3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -229,7 +229,7 @@ jobs:
       - run:
           command: |
             git fetch --tags --prune --progress --no-recurse-submodules origin
-            git checkout --progress --force $CIRCLE_SHA1
+            #git checkout --progress --force $CIRCLE_SHA1
             docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
       - run:
           name: Docker tag image

From e5c4a7c5b57e4e06a2e7f6f3595e6fde117a43b0 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 10:56:57 -0400
Subject: [PATCH 21/29] Update config.yml

---
 .circleci/config.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 44eb3d3..326d2b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -227,9 +227,18 @@ jobs:
           name: Docker pull
           command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
       - run:
+          name: Checkout with tags
           command: |
-            git fetch --tags --prune --progress --no-recurse-submodules origin
-            #git checkout --progress --force $CIRCLE_SHA1
+            git fetch --force origin "refs/tags/${CIRCLE_TAG}:refs/tags/${CIRCLE_TAG}"
+            if [ -n "$CIRCLE_BRANCH" ]
+            then
+            git reset --hard $CIRCLE_SHA1
+            git checkout -q -B $CIRCLE_BRANCH
+            fi
+            git reset --hard $CIRCLE_SHA1
+      - run:
+          command: |
+
             docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
       - run:
           name: Docker tag image

From a6da2d2ec0cd8ca1b9a1e5307b8fb0830a76bdce Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 11:08:53 -0400
Subject: [PATCH 22/29] Update config.yml

---
 .circleci/config.yml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 326d2b2..af28d99 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -227,19 +227,8 @@ jobs:
           name: Docker pull
           command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
       - run:
-          name: Checkout with tags
           command: |
-            git fetch --force origin "refs/tags/${CIRCLE_TAG}:refs/tags/${CIRCLE_TAG}"
-            if [ -n "$CIRCLE_BRANCH" ]
-            then
-            git reset --hard $CIRCLE_SHA1
-            git checkout -q -B $CIRCLE_BRANCH
-            fi
-            git reset --hard $CIRCLE_SHA1
-      - run:
-          command: |
-
-            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
+            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch
       - run:
           name: Docker tag image
           command: |

From aca03370f518c170403500f675d3bdfded6ac48e Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 11:11:22 -0400
Subject: [PATCH 23/29] Update config.yml

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index af28d99..d0239a5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -228,7 +228,8 @@ jobs:
           command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
       - run:
           command: |
-            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch
+            ls -la
+            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch\;ls -la
       - run:
           name: Docker tag image
           command: |

From 84b59b97fd077851d1dad1da6add8630d9eded75 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 11:11:39 -0400
Subject: [PATCH 24/29] Update config.yml

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d0239a5..4f140dc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -229,6 +229,7 @@ jobs:
       - run:
           command: |
             ls -la
+            git status
             docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch\;ls -la
       - run:
           name: Docker tag image

From 63b2b26b217ad00cf0b2718c2d209567cb19e476 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 11:18:55 -0400
Subject: [PATCH 25/29] Update config.yml

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f140dc..d328f84 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -214,7 +214,7 @@ jobs:
     environment:
       IMAGE_NAME: rfaircloth/scs
     docker:
-      - image: circleci/buildpack-deps:stretch
+      - image: circleci/buildpack-deps:latest
     steps:
       - checkout
       - setup_remote_docker:
@@ -230,7 +230,7 @@ jobs:
           command: |
             ls -la
             git status
-            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch\;ls -la
+            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable /nofetch SemVer
       - run:
           name: Docker tag image
           command: |

From f3250fcefad3b4e211ca5b6e606fadb0e482e71e Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 11:23:08 -0400
Subject: [PATCH 26/29] Update config.yml

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d328f84..e4c45c5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -230,17 +230,17 @@ jobs:
           command: |
             ls -la
             git status
-            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable /nofetch SemVer
+            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch
       - run:
           name: Docker tag image
           command: |
-            SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer)
+            SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch)
             echo $SEMVER
             docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$SEMVER
       - run:
           name: Docker push tag
           command: |
-            SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer)
+            SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch)
             echo $SEMVER
             docker push splunk/scs:$SEMVER
   publish-latest:

From baf2dbdb9173d5c98281465f230a23c080d1585d Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 11:31:12 -0400
Subject: [PATCH 27/29] Update config.yml

---
 .circleci/config.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e4c45c5..4ef85f8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -211,15 +211,14 @@ jobs:
           command: docker push $IMAGE_NAME:edge
 
   publish-version:
+    machine:
+      image: ubuntu-1604:201903-01
+      docker_layer_caching: true    # default - false
     environment:
       IMAGE_NAME: rfaircloth/scs
-    docker:
-      - image: circleci/buildpack-deps:latest
     steps:
       - checkout
-      - setup_remote_docker:
-          version: 18.09.3
-          docker_layer_caching: true
+
       - run:
           name: Docker Login
           command: docker login -u $DOCKER_USER -p $DOCKER_PASS

From 364d946c636bb1917853f4ae110253ba3c0b7935 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 11:36:23 -0400
Subject: [PATCH 28/29] Update config.yml

---
 .circleci/config.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4ef85f8..80a453b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -212,7 +212,8 @@ jobs:
 
   publish-version:
     machine:
-      image: ubuntu-1604:201903-01
+      #image: ubuntu-1604:201903-01
+      image: buildpack-deps:latest
       docker_layer_caching: true    # default - false
     environment:
       IMAGE_NAME: rfaircloth/scs
@@ -225,22 +226,15 @@ jobs:
       - run:
           name: Docker pull
           command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
-      - run:
-          command: |
-            ls -la
-            git status
-            docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch
       - run:
           name: Docker tag image
           command: |
             SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch)
-            echo $SEMVER
             docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$SEMVER
       - run:
           name: Docker push tag
           command: |
             SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch)
-            echo $SEMVER
             docker push splunk/scs:$SEMVER
   publish-latest:
     environment:

From 0d0bc647c540768214bbfd7a8a27a603bc61bc28 Mon Sep 17 00:00:00 2001
From: ryan faircloth <rfaircloth@splunk.com>
Date: Tue, 27 Aug 2019 11:44:04 -0400
Subject: [PATCH 29/29] Update config.yml

---
 .circleci/config.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 80a453b..4e5fae6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -212,8 +212,7 @@ jobs:
 
   publish-version:
     machine:
-      #image: ubuntu-1604:201903-01
-      image: buildpack-deps:latest
+      image: ubuntu-1604:201903-01
       docker_layer_caching: true    # default - false
     environment:
       IMAGE_NAME: rfaircloth/scs