diff --git a/.circleci/config.yml b/.circleci/config.yml index 89d1e1f..4a82547 100644 --- 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 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 diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index 26eced6..5201e5b 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -94,4 +94,4 @@ volumes: sc4s-results: external: true splunk-etc: - external: true \ No newline at end of file + external: true