Merge branch 'develop' into tests/splunk-secret-env

Author: nwang92

.circleci/config.yml

@@ -41,9 +41,9 @@ jobs:
           command: make test_python2_all
       - run:
           name: Test if image size increase
-          command: make test_debian9_image_size
+          command: make test_debian10_image_size
       - run:
-          name: Running debian9 CI Tests
+          name: Running debian10 CI Tests
           command: make run_tests_debian10
           no_output_timeout: 20m
       - store_artifacts:

Makefile

@@ -400,8 +400,8 @@ docker exec -it $1 bash -c 'if [[ $$(python -V 2>&1) =~ "Python 2" ]] ; then ech
 docker kill $1
 endef
 
-test_debian9_image_size:
-	$(call test_image_size,splunk-debian-9)
+test_debian10_image_size:
+	$(call test_image_size,splunk-debian-10)
 
 define test_image_size
 docker pull splunk/splunk:edge

base/redhat-8/Dockerfile

@@ -25,9 +25,9 @@ LABEL name="splunk" \
       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."
 
-RUN mkdir /licenses; \
-	curl -o /licenses/apache-2.0.txt https://www.apache.org/licenses/LICENSE-2.0.txt; \
-	curl -o /licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf
-
 COPY install.sh /install.sh
-RUN /install.sh && rm -rf /install.sh
+
+RUN mkdir /licenses \
+    && curl -o /licenses/apache-2.0.txt https://www.apache.org/licenses/LICENSE-2.0.txt \
+    && curl -o /licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf \
+    && /install.sh && rm -rf /install.sh

splunk/common-files/entrypoint.sh

@@ -163,7 +163,7 @@ case "$1" in
 		configure_multisite $0
 		;;
 	create-defaults)
-	  create_defaults
+		create_defaults
 		;;
 	restart)
 		shift