From eac686ccccbf482abb4ed3939e8ff8c58d4e0671 Mon Sep 17 00:00:00 2001
From: Alisha Mayor <amayor@splunk.com>
Date: Tue, 2 Feb 2021 08:14:32 -0800
Subject: [PATCH] Updating Makefile and Changelog for Release/8.1.2 (#453)

* Updating Makefile and changelog for Release/8.1.2

* Upgrade Python versions on CI machine
---
 .circleci/config.yml | 13 ++++++-------
 Makefile             |  4 ++--
 docs/CHANGELOG.md    | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c3fadbc7..01b9dc77 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,18 +6,17 @@ executors:
       - image: cimg/python:3.7
   circleci_large:
     machine:
-      image: ubuntu-1604:201903-01
+      image: ubuntu-1604:202007-01
     resource_class: large
   circleci_xlarge:
     machine:
-      image: ubuntu-1604:201903-01
+      image: ubuntu-1604:202007-01
     resource_class: xlarge
 
 orbs:
   anchore: anchore/anchore-engine@1.8.2
 
 jobs:
-
   build_debian_10:
     executor: py3
     steps:
@@ -120,7 +119,7 @@ jobs:
       - run:
           name: Setup python3
           command: |
-            pyenv global 2.7.12 3.5.2
+            pyenv global 2.7.18 3.7.8
             python --version
             pip --version
             python3 --version
@@ -152,7 +151,7 @@ jobs:
       - run:
           name: Setup python3
           command: |
-            pyenv global 2.7.12 3.5.2
+            pyenv global 2.7.18 3.7.8
             python --version
             pip --version
             python3 --version
@@ -184,7 +183,7 @@ jobs:
       - run:
           name: Setup python3
           command: |
-            pyenv global 2.7.12 3.5.2
+            pyenv global 2.7.18 3.7.8
             python --version
             pip --version
             python3 --version
@@ -219,7 +218,7 @@ jobs:
       - run:
           name: Setup python3
           command: |
-            pyenv global 2.7.12 3.5.2
+            pyenv global 2.7.18 3.7.8
             python --version
             pip --version
             python3 --version
diff --git a/Makefile b/Makefile
index 71067e1f..dd44f532 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ SPLUNK_ANSIBLE_BRANCH ?= develop
 SPLUNK_COMPOSE ?= cluster_absolute_unit.yaml
 # Set Splunk version/build parameters here to define downstream URLs and file names
 SPLUNK_PRODUCT := splunk
-SPLUNK_VERSION := 8.1.1
-SPLUNK_BUILD := 08187535c166
+SPLUNK_VERSION := 8.1.2
+SPLUNK_BUILD := 545206cc9f70
 ifeq ($(shell arch), s390x)
 	SPLUNK_ARCH = s390x
 else
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 01e4019f..ed4227f9 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -44,6 +44,22 @@
 
 ---
 
+## 8.1.2
+
+#### What's New?
+* Releasing new images to support Splunk Enterprise release.
+
+#### docker-splunk changes:
+* Bumping Splunk version. For details, see [Fixed issues for 8.1.2](https://docs.splunk.com/Documentation/Splunk/8.1.2/ReleaseNotes/Fixedissues)
+* Updated Red Hat and Debian base images to only use Python 3
+* Switched vulnerability scanner from Clair to Trivy + Anchore
+* Bugfixes and documentation updates
+
+#### splunk-ansible changes:
+* Bugfixes and documentation updates
+
+---
+
 ## 8.1.1
 
 #### What's New?