Skip to content

Updating master with 8.0.0 release. #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 22, 2019
Merged

Updating master with 8.0.0 release. #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca05c51
Updating splunk version
Oct 21, 2019
fbc317d
Merge branch 'develop' into up-splunk-version
Oct 22, 2019
a309b6e
increasing image size increase limit
Oct 22, 2019
4605583
Merge pull request #261 from splunk/up-splunk-version
Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
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 := 7.3.2
SPLUNK_BUILD := c60db69f8e32
SPLUNK_VERSION := 8.0.0
SPLUNK_BUILD := 1357bef0a7f6
ifeq ($(shell arch), s390x)
SPLUNK_ARCH = s390x
else
Expand Down Expand Up @@ -409,7 +409,7 @@ CUR_SIZE=$$(docker image inspect $1:latest --format='{{.Size}}') ; \
EDGE_SIZE=$$(docker image inspect splunk/splunk:edge --format='{{.Size}}') ; \
echo "current $1 image size = "$$CUR_SIZE ; \
echo "edge image size = "$$EDGE_SIZE ; \
if [[ $$CUR_SIZE -gt $$EDGE_SIZE*120/100 ]] ; then echo "current image size is 20% more than edge image" ; exit 1 ; fi
if [[ $$CUR_SIZE -gt $$EDGE_SIZE*140/100 ]] ; then echo "current image size is 40% more than edge image" ; exit 1 ; fi
endef

setup_clair_scanner:
Expand Down
2 changes: 1 addition & 1 deletion base/redhat-8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal
LABEL name="splunk" \
maintainer="support@splunk.com" \
vendor="splunk" \
version="7.3.2" \
version="8.0.0" \
release="1" \
summary="UBI 8 Docker image of Splunk Enterprise" \
description="Splunk Enterprise is a platform for operational intelligence. Our software lets you collect, analyze, and act upon the untapped value of big data that your technology infrastructure, security systems, and business applications generate. It gives you insights to drive operational performance and business results."
Expand Down
2 changes: 1 addition & 1 deletion tests/test_docker_splunk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

global platform
platform = "debian-9"
OLD_SPLUNK_VERSION = "7.2.7"
OLD_SPLUNK_VERSION = "7.3.2"


def generate_random_string():
Expand Down