Skip to content

Commit

Permalink
Updating Makefile and Changelog for Release/8.1.2 (#453)
Browse files Browse the repository at this point in the history
* Updating Makefile and changelog for Release/8.1.2

* Upgrade Python versions on CI machine
  • Loading branch information
alishamayor authored Feb 2, 2021
1 parent ca27b91 commit eac686c
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 9 deletions.
13 changes: 6 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down

0 comments on commit eac686c

Please sign in to comment.