Merge branch 'release/0.4.0' into develop

CSVD · Aug 27, 2019 · f02ec26 · f02ec26
2 parents c1c84fe + 3b1ed68
commit f02ec26
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -125,7 +125,6 @@ jobs:
             docker cp tests/ dummy:/work/tests/
             docker cp ./splunk/etc/* dummy:/work/splunk-etc/
             docker rm dummy
-
       - run:
           name: Docker Compose build
           command: |
@@ -210,6 +209,31 @@ jobs:
           name: Docker push tag
           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
+    steps:
+      - checkout
+
+      - 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 /showvariable SemVer /nofetch)
+            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)
+            docker push splunk/scs:$SEMVER
   publish-latest:
     environment:
       IMAGE_NAME: rfaircloth/scs
@@ -262,6 +286,15 @@ workflows:
             branches:
               only:
                 - develop
+      - publish-version:
+          requires:
+            - dgoss
+            - test-unit
+          filters:
+            branches:
+              only:
+                - master
+                - /^release\/.*/
       - publish-latest:
           requires:
             - dgoss

diff --git a/CHANGELOG 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
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
@@ -94,4 +94,4 @@ volumes:
   sc4s-results:
     external: true
   splunk-etc:
-    external: true
+    external: true