From ca05c517ea46bccb699ffae16b93b3d8e29ef69b Mon Sep 17 00:00:00 2001 From: Nelson Wang Date: Mon, 21 Oct 2019 15:11:21 -0700 Subject: [PATCH 1/2] Updating splunk version --- Makefile | 4 ++-- base/redhat-8/Dockerfile | 2 +- tests/test_docker_splunk.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 300f8227..2cf06974 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 := 7.3.2 -SPLUNK_BUILD := c60db69f8e32 +SPLUNK_VERSION := 8.0.0 +SPLUNK_BUILD := 1357bef0a7f6 ifeq ($(shell arch), s390x) SPLUNK_ARCH = s390x else diff --git a/base/redhat-8/Dockerfile b/base/redhat-8/Dockerfile index b330fa4c..b1ba7a0a 100644 --- a/base/redhat-8/Dockerfile +++ b/base/redhat-8/Dockerfile @@ -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." diff --git a/tests/test_docker_splunk.py b/tests/test_docker_splunk.py index dc26794d..189268e8 100644 --- a/tests/test_docker_splunk.py +++ b/tests/test_docker_splunk.py @@ -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(): From a309b6e7c287032a478cb026669cd5b7ece65156 Mon Sep 17 00:00:00 2001 From: tonyl Date: Mon, 21 Oct 2019 19:43:01 -0700 Subject: [PATCH 2/2] increasing image size increase limit --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2cf06974..ebcb9c8e 100644 --- a/Makefile +++ b/Makefile @@ -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: