From eeacb62c240d6e0cf85d84044ea0dbd5a020b513 Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Thu, 7 May 2020 15:20:01 -0400 Subject: [PATCH 1/2] 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 4a8f8ce..92332a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -215,15 +215,18 @@ jobs: name: Build Docker command: | if [ -n "${CIRCLE_TAG}" ]; then VERSION=${CIRCLE_TAG}; else VERSION="$(./semtag getcurrent)"; fi + VERSION_DOCKER_MMP=$(echo $VERSION | sed -n 's/v\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/p') echo ${VERSION} >package/VERSION echo ${CIRCLE_SHA1}=${VERSION} docker build --build-arg BRANCH=${SYSLOG} package -t splunk/scs:${CIRCLE_SHA1} docker tag splunk/scs:${CIRCLE_SHA1} splunk/scs:${VERSION} + docker tag splunk/scs:${CIRCLE_SHA1} splunk/scs:${VERSION_DOCKER_MMP} docker tag splunk/scs:${CIRCLE_SHA1} splunk/scs:${CIRCLE_SHA1:0:7} docker push splunk/scs:${CIRCLE_SHA1} docker push splunk/scs:${VERSION} + docker push splunk/scs:${VERSION_DOCKER_MMP} docker push splunk/scs:${CIRCLE_SHA1:0:7} - docker save splunk/scs:${VERSION} | gzip -c > /tmp/workspace/oci_container.tar.gz + docker save splunk/scs:${VERSION_DOCKER_MMP} | gzip -c > /tmp/workspace/oci_container.tar.gz - go/install - run: name: "Publish on GitHub" From 6f1eb2b68ba023a8929c7e15e05d60b76c056a86 Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Thu, 7 May 2020 15:29:53 -0400 Subject: [PATCH 2/2] Update base image to 3.27.1 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 92332a4..6ad2412 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,7 +90,7 @@ jobs: docker: - image: circleci/python:3.7 environment: - SYSLOG: "syslog-ng-3.26.1" + SYSLOG: "syslog-ng-3.27.1" SPLUNK_VERSION: "8.0.2" <<: *test test-sc4s-next-splunk-8-0: @@ -104,14 +104,14 @@ jobs: docker: - image: circleci/python:3.7 environment: - SYSLOG: "syslog-ng-3.26.1" + SYSLOG: "syslog-ng-3.27.1" SPLUNK_VERSION: "7.3.4" <<: *test test-sc4s-current-splunk-7-2: docker: - image: circleci/python:3.7 environment: - SYSLOG: "syslog-ng-3.26.1" + SYSLOG: "syslog-ng-3.27.1" SPLUNK_VERSION: "7.2.9" <<: *test