From 494757a44b5b79de088351f9c81247374bc2af3a Mon Sep 17 00:00:00 2001
From: "Michael S. Wilde" <thewilde@splunk.com>
Date: Fri, 21 Jul 2017 15:14:50 -0500
Subject: [PATCH 01/15] Updated for splunk version 6.6.2

All changes made to modify this to 6.6.2
---
 CONTRIBUTING.md                       |  2 +-
 enterprise/Dockerfile                 |  4 ++--
 enterprise/README.md                  | 18 +++++++++---------
 enterprise/build.sh                   |  8 ++++----
 enterprise/docker-compose.yml         |  6 +++---
 enterprise/entrypoint.sh              |  4 ++--
 enterprise/publishImage.sh            |  4 ++--
 universalforwarder/Dockerfile         |  4 ++--
 universalforwarder/README.md          | 12 ++++++------
 universalforwarder/build.sh           |  8 ++++----
 universalforwarder/docker-compose.yml | 10 +++++-----
 universalforwarder/entrypoint.sh      |  2 +-
 universalforwarder/publishImage.sh    |  4 ++--
 13 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 09c6b37..e24f29f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ If you experience problems or see unexpected behavior with this project, create
 
 0. Version of this project you're using (ex: 1.5.0)
 0. Platform version (ex: Windows Server 2012 R2)
-0. Splunk version (ex: 6.6.1)
+0. Splunk version (ex: 6.6.2)
 0. Other relevant information (ex: local/remote environment, Splunk network configuration)
 
 Alternatively, if you have a Splunk question please ask on [Splunk Answers][answers].
diff --git a/enterprise/Dockerfile b/enterprise/Dockerfile
index 5276d5d..01b4f2c 100644
--- a/enterprise/Dockerfile
+++ b/enterprise/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT splunk
-ENV SPLUNK_VERSION 6.6.1
-ENV SPLUNK_BUILD aeae3fe0c5af
+ENV SPLUNK_VERSION 6.6.2
+ENV SPLUNK_BUILD 4b804538c686
 ENV SPLUNK_FILENAME splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk
diff --git a/enterprise/README.md b/enterprise/README.md
index 6485716..607c900 100644
--- a/enterprise/README.md
+++ b/enterprise/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `6.6.1`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `6.6.2`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk Enterprise with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/enterprise/Dockerfile)
 
 # What is Splunk Enterprise?
@@ -16,7 +16,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 6.6.1 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 6.6.2 image.<br>
    
    ```bash
    docker pull splunk/splunk
@@ -35,10 +35,10 @@ See [How to use the Splunk Enterprise Docker image](#How-to-use-the-Splunk-Enter
 The following commands can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 
-### Pull an image for version 6.6.1 of Splunk Enterprise from this repository
+### Pull an image for version 6.6.2 of Splunk Enterprise from this repository
 
 ```bash
-docker pull splunk/splunk:6.6.1
+docker pull splunk/splunk:6.6.2
 ```
 
 ### Pull an image that uses the latest version of Splunk Enterprise from this repository
@@ -52,13 +52,13 @@ docker pull splunk/splunk:latest
 This command starts a Splunk Enterprise instance from the Docker container in this repository, accepts the license agreement, and opens TCP port 8000 so that you can access the Splunk instance from your local machine.
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:6.6.1
+docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:6.6.2
 ```
 ### Start a Splunk Enterprise container and mount the necessary container volumes
 
 ```bash
 docker run --name vsplunk -v /opt/splunk/etc -v /opt/splunk/var busybox
-docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:6.6.1
+docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:6.6.2
 ```
 
 > Note:
@@ -70,7 +70,7 @@ docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -
 ### Start a Splunk Enterprise container and mount volumes from host
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:6.6.1
+docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:6.6.2
 ```
 
 ### Use entrypoint.sh to execute Splunk commands
@@ -92,7 +92,7 @@ You can also use entrypoint.sh to configure Splunk services with environment var
 3. Insert the following block of text into the file.
   
    ```
-   version: '2'
+   version: '3'
    services:
     vsplunk:
         image: busybox
@@ -131,7 +131,7 @@ You can also use entrypoint.sh to configure Splunk services with environment var
 
 The `splunk/splunk` image comes in several variants:
 
-`splunk/splunk:6.6.1`
+`splunk/splunk:6.6.2`
 This is the default Splunk Enterprise image.
 
 `splunk/splunk:6.5.3-monitor`
diff --git a/enterprise/build.sh b/enterprise/build.sh
index 3abf822..3a94a51 100755
--- a/enterprise/build.sh
+++ b/enterprise/build.sh
@@ -3,7 +3,7 @@ if [ -z $CURRENT ]; then
 	CURRENT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 fi
 
-docker build --no-cache=true -t splunk/splunk:6.6.1 .
-docker tag splunk/splunk:6.6.1 splunk/splunk:latest 
-docker tag splunk/splunk:6.6.1 registry.splunk.com/splunk/splunk:latest 
-docker tag splunk/splunk:6.6.1 registry.splunk.com/splunk/splunk:6.6.1 
\ No newline at end of file
+docker build --no-cache=true -t splunk/splunk:6.6.2 .
+docker tag splunk/splunk:6.6.2 splunk/splunk:latest 
+docker tag splunk/splunk:6.6.2 registry.splunk.com/splunk/splunk:latest 
+docker tag splunk/splunk:6.6.2 registry.splunk.com/splunk/splunk:6.6.2 
\ No newline at end of file
diff --git a/enterprise/docker-compose.yml b/enterprise/docker-compose.yml
index 3411841..3a3a333 100644
--- a/enterprise/docker-compose.yml
+++ b/enterprise/docker-compose.yml
@@ -1,7 +1,7 @@
 # must accept EULA the first time that the image is started
-# docker run splunk/enterprise:6.6.1
+# docker run splunk/enterprise:6.6.2
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/enterprisetrial:6.6.1
+# 1. docker run -it splunk/enterprisetrial:6.6.2
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
 # e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/enterprisetrial 
 
@@ -16,7 +16,7 @@ services:
   splunkenterprise:
     #build: .
     hostname: splunkenterprise
-    image: splunk/splunk:6.6.1
+    image: splunk/splunk:6.6.2
     environment:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997
diff --git a/enterprise/entrypoint.sh b/enterprise/entrypoint.sh
index d5577f5..1a59c30 100644
--- a/enterprise/entrypoint.sh
+++ b/enterprise/entrypoint.sh
@@ -51,8 +51,8 @@ Splunk Enterprise
 
   Usage:
 
-    docker run -it splunk/enterprise:6.6.1
-    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:6.6.1
+    docker run -it splunk/enterprise:6.6.2
+    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:6.6.2
 
 EOF
     exit 1
diff --git a/enterprise/publishImage.sh b/enterprise/publishImage.sh
index 873f19e..ee1c3c0 100755
--- a/enterprise/publishImage.sh
+++ b/enterprise/publishImage.sh
@@ -1,7 +1,7 @@
 
-docker push splunk/splunk:6.6.1
+docker push splunk/splunk:6.6.2
 docker push splunk/splunk:latest
-docker push registry.splunk.com/splunk/splunk:6.6.1
+docker push registry.splunk.com/splunk/splunk:6.6.2
 docker push registry.splunk.com/splunk/splunk:latest
 
 
diff --git a/universalforwarder/Dockerfile b/universalforwarder/Dockerfile
index 2e380db..ef04f64 100644
--- a/universalforwarder/Dockerfile
+++ b/universalforwarder/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT universalforwarder
-ENV SPLUNK_VERSION 6.6.1
-ENV SPLUNK_BUILD aeae3fe0c5af
+ENV SPLUNK_VERSION 6.6.2
+ENV SPLUNK_BUILD 4b804538c686
 ENV SPLUNK_FILENAME splunkforwarder-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk
diff --git a/universalforwarder/README.md b/universalforwarder/README.md
index 421fc77..6d99652 100644
--- a/universalforwarder/README.md
+++ b/universalforwarder/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `6.6.1`, `latest` - Splunk universal forwarder base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `6.6.2`, `latest` - Splunk universal forwarder base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk universal forwarder with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/universalforwarder/Dockerfile)
 
 # What is the Splunk Universal Forwarder?
@@ -18,7 +18,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 6.6.1 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 6.6.2 image.<br>
 
    
    ```bash
@@ -49,14 +49,14 @@ The universal forwarder docker image can collect data from a host and send data
 The following commands are examples of how to pull and run the universal forwarder Docker image. They can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 ### Pull an image from this repository for the universal fowarder with the Docker data collection inputs
-The `6.6.1-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
+The `6.6.2-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
 
 ```bash
-docker pull splunk/universalforwarder:6.6.1-monitor
+docker pull splunk/universalforwarder:6.6.2-monitor
 ```
 
 ### Pull the latest version of the image from this repository
-The `6.6.1` and `latest` versions only have the forwarder and do not have any of the data inputs.
+The `6.6.2` and `latest` versions only have the forwarder and do not have any of the data inputs.
 =======
 The `6.5.3-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
 
@@ -136,7 +136,7 @@ You can also use entrypoint.sh to configure Splunk services with environment var
 
 The `splunk/universalforwarder` image comes in the following variants:
 
-`splunk/universalforwarder:6.6.1` and `splunk/universalforwarder:latest`
+`splunk/universalforwarder:6.6.2` and `splunk/universalforwarder:latest`
 This is the default universal forwarder image.
 
 `splunk/universalforwarder:6.5.3-monitor`
diff --git a/universalforwarder/build.sh b/universalforwarder/build.sh
index e4ffea3..bad2b65 100755
--- a/universalforwarder/build.sh
+++ b/universalforwarder/build.sh
@@ -4,9 +4,9 @@ if [ -z $CURRENT ]; then
 fi
 
 
-docker build --no-cache=true -t splunk/universalforwarder:6.6.1 $CURRENT
-docker tag splunk/universalforwarder:6.6.1 splunk/universalforwarder:latest
-docker tag splunk/universalforwarder:6.6.1 registry.splunk.com/splunk/universalforwarder:6.6.1
-docker tag splunk/universalforwarder:6.6.1 registry.splunk.com/splunk/universalforwarder:latest
+docker build --no-cache=true -t splunk/universalforwarder:6.6.2 $CURRENT
+docker tag splunk/universalforwarder:6.6.2 splunk/universalforwarder:latest
+docker tag splunk/universalforwarder:6.6.2 registry.splunk.com/splunk/universalforwarder:6.6.2
+docker tag splunk/universalforwarder:6.6.2 registry.splunk.com/splunk/universalforwarder:latest
 
 
diff --git a/universalforwarder/docker-compose.yml b/universalforwarder/docker-compose.yml
index 052f5c3..5eae251 100644
--- a/universalforwarder/docker-compose.yml
+++ b/universalforwarder/docker-compose.yml
@@ -1,12 +1,12 @@
 # must accept EULA the first time that the image is started
 
-# docker run splunk/universalforwarder:6.6.1
+# docker run splunk/universalforwarder:6.6.2
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/universalforwarder:6.6.1
+# 1. docker run -it splunk/universalforwarder:6.6.2
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
-# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:6.6.1 
+# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:6.6.2 
 
-version: '2'
+version: '3'
 services:
   vsplunk_uf:
     image: busybox
@@ -16,7 +16,7 @@ services:
   splunkuniversalforwarder:
 #    build: .
     hostname: splunkuniversalforwarder
-    image: splunk/universalforwarder:6.6.1
+    image: splunk/universalforwarder:6.6.2
 #    environment:
 #      SPLUNK_START_ARGS: --accept-license
     volumes_from:
diff --git a/universalforwarder/entrypoint.sh b/universalforwarder/entrypoint.sh
index b336f61..8bcb727 100644
--- a/universalforwarder/entrypoint.sh
+++ b/universalforwarder/entrypoint.sh
@@ -51,7 +51,7 @@ Splunk Forwarder
 
   Usage:
 
-    docker run -it splunk/universalforwarder:6.6.1
+    docker run -it splunk/universalforwarder:6.6.2
     docker run --env SPLUNK_START_ARGS="--accept-license" outcoldman/splunk:latest-forwarder
 
 EOF
diff --git a/universalforwarder/publishImage.sh b/universalforwarder/publishImage.sh
index 2534b4b..0fb26d8 100755
--- a/universalforwarder/publishImage.sh
+++ b/universalforwarder/publishImage.sh
@@ -1,5 +1,5 @@
 #https://docs.docker.com/mac/step_six/
-docker push splunk/universalforwarder:6.6.1
+docker push splunk/universalforwarder:6.6.2
 docker push splunk/universalforwarder:latest
 docker push registry.splunk.com/splunk/universalforwarder:latest
-docker push registry.splunk.com/splunk/universalforwarder:6.6.1
+docker push registry.splunk.com/splunk/universalforwarder:6.6.2

From d9ef1d5b9c61733eac7ff62b7adbceb5f7d993b9 Mon Sep 17 00:00:00 2001
From: "Michael S. Wilde" <thewilde@splunk.com>
Date: Fri, 21 Jul 2017 15:26:28 -0500
Subject: [PATCH 02/15] trying with slimmer version of debian

stretch-slim, vs jessie
---
 enterprise/Dockerfile         | 2 +-
 universalforwarder/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/enterprise/Dockerfile b/enterprise/Dockerfile
index 01b4f2c..0e331a4 100644
--- a/enterprise/Dockerfile
+++ b/enterprise/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:jessie
+FROM debian:stretch-slim
 
 ENV SPLUNK_PRODUCT splunk
 ENV SPLUNK_VERSION 6.6.2
diff --git a/universalforwarder/Dockerfile b/universalforwarder/Dockerfile
index ef04f64..7e1e881 100644
--- a/universalforwarder/Dockerfile
+++ b/universalforwarder/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:jessie
+FROM debian:stretch-slim
 
 ENV SPLUNK_PRODUCT universalforwarder
 ENV SPLUNK_VERSION 6.6.2

From a59de31e76116b9d7f043f64e3dd9d773ace3fc6 Mon Sep 17 00:00:00 2001
From: "Michael S. Wilde" <thewilde@splunk.com>
Date: Sun, 23 Jul 2017 09:17:12 -0500
Subject: [PATCH 03/15] tried with debian:jessie-slim, stretch-slim, stretch. 
 splunk only seems to work with debian:jessie

---
 enterprise/Dockerfile         | 10 +++++-----
 universalforwarder/Dockerfile | 12 ++++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/enterprise/Dockerfile b/enterprise/Dockerfile
index 0e331a4..7499d23 100644
--- a/enterprise/Dockerfile
+++ b/enterprise/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:jessie
 
 ENV SPLUNK_PRODUCT splunk
 ENV SPLUNK_VERSION 6.6.2
@@ -16,16 +16,16 @@ RUN groupadd -r ${SPLUNK_GROUP} \
     && useradd -r -m -g ${SPLUNK_GROUP} ${SPLUNK_USER}
 
 # make the "en_US.UTF-8" locale so splunk will be utf-8 enabled by default
-RUN apt-get update && apt-get install -y locales \
-    && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+RUN apt-get update  && apt-get install -y --no-install-recommends apt-utils && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \
+	&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 ENV LANG en_US.utf8
 
 # pdfgen dependency
-RUN apt-get install -y libgssapi-krb5-2
+RUN apt-get update && apt-get install -y libgssapi-krb5-2 && rm -rf /var/lib/apt/lists/*
 
 # Download official Splunk release, verify checksum and unzip in /opt/splunk
 # Also backup etc folder, so it will be later copied to the linked volume
-RUN apt-get install -y wget sudo \
+RUN apt-get update && apt-get install -y wget sudo \
     && mkdir -p ${SPLUNK_HOME} \
     && wget -qO /tmp/${SPLUNK_FILENAME} https://download.splunk.com/products/${SPLUNK_PRODUCT}/releases/${SPLUNK_VERSION}/linux/${SPLUNK_FILENAME} \
     && wget -qO /tmp/${SPLUNK_FILENAME}.md5 https://download.splunk.com/products/${SPLUNK_PRODUCT}/releases/${SPLUNK_VERSION}/linux/${SPLUNK_FILENAME}.md5 \
diff --git a/universalforwarder/Dockerfile b/universalforwarder/Dockerfile
index 7e1e881..5cd2090 100644
--- a/universalforwarder/Dockerfile
+++ b/universalforwarder/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:jessie
 
 ENV SPLUNK_PRODUCT universalforwarder
 ENV SPLUNK_VERSION 6.6.2
@@ -16,13 +16,17 @@ RUN groupadd -r ${SPLUNK_GROUP} \
     && useradd -r -m -g ${SPLUNK_GROUP} ${SPLUNK_USER}
 
 # make the "en_US.UTF-8" locale so splunk will be utf-8 enabled by default
-RUN apt-get update && apt-get install -y locales \
-    && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+#RUN apt-get update && apt-get install -y locales \
+#    && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+#ENV LANG en_US.utf8
+
+RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \
+	&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 ENV LANG en_US.utf8
 
 # Download official Splunk release, verify checksum and unzip in /opt/splunk
 # Also backup etc folder, so it will be later copied to the linked volume
-RUN apt-get install -y wget sudo \
+RUN apt-get update && apt-get install -y wget sudo \
     && mkdir -p ${SPLUNK_HOME} \
     && wget -qO /tmp/${SPLUNK_FILENAME} https://download.splunk.com/products/${SPLUNK_PRODUCT}/releases/${SPLUNK_VERSION}/linux/${SPLUNK_FILENAME} \
     && wget -qO /tmp/${SPLUNK_FILENAME}.md5 https://download.splunk.com/products/${SPLUNK_PRODUCT}/releases/${SPLUNK_VERSION}/linux/${SPLUNK_FILENAME}.md5 \

From 74493fcb30dde6c9f32af162214ce877cbf15f30 Mon Sep 17 00:00:00 2001
From: Maarten Hoogcarspel <maarten@hoogcarspel.net>
Date: Tue, 22 Aug 2017 11:03:17 +0100
Subject: [PATCH 04/15] Update for splunk version 6.6.3

---
 CONTRIBUTING.md                       |  2 +-
 enterprise/Dockerfile                 |  4 ++--
 enterprise/README.md                  | 16 ++++++++--------
 enterprise/build.sh                   |  8 ++++----
 enterprise/docker-compose.yml         |  6 +++---
 enterprise/entrypoint.sh              |  4 ++--
 enterprise/publishImage.sh            |  4 ++--
 universalforwarder/Dockerfile         |  4 ++--
 universalforwarder/README.md          | 12 ++++++------
 universalforwarder/build.sh           |  8 ++++----
 universalforwarder/docker-compose.yml | 12 ++++++------
 universalforwarder/entrypoint.sh      |  2 +-
 universalforwarder/publishImage.sh    |  4 ++--
 13 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e24f29f..896ecda 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ If you experience problems or see unexpected behavior with this project, create
 
 0. Version of this project you're using (ex: 1.5.0)
 0. Platform version (ex: Windows Server 2012 R2)
-0. Splunk version (ex: 6.6.2)
+0. Splunk version (ex: 6.6.3)
 0. Other relevant information (ex: local/remote environment, Splunk network configuration)
 
 Alternatively, if you have a Splunk question please ask on [Splunk Answers][answers].
diff --git a/enterprise/Dockerfile b/enterprise/Dockerfile
index 7499d23..e68c578 100644
--- a/enterprise/Dockerfile
+++ b/enterprise/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT splunk
-ENV SPLUNK_VERSION 6.6.2
-ENV SPLUNK_BUILD 4b804538c686
+ENV SPLUNK_VERSION 6.6.3
+ENV SPLUNK_BUILD e21ee54bc796
 ENV SPLUNK_FILENAME splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk
diff --git a/enterprise/README.md b/enterprise/README.md
index 607c900..a01ac19 100644
--- a/enterprise/README.md
+++ b/enterprise/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `6.6.2`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `6.6.3`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk Enterprise with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/enterprise/Dockerfile)
 
 # What is Splunk Enterprise?
@@ -16,7 +16,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 6.6.2 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 6.6.3 image.<br>
    
    ```bash
    docker pull splunk/splunk
@@ -35,10 +35,10 @@ See [How to use the Splunk Enterprise Docker image](#How-to-use-the-Splunk-Enter
 The following commands can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 
-### Pull an image for version 6.6.2 of Splunk Enterprise from this repository
+### Pull an image for version 6.6.3 of Splunk Enterprise from this repository
 
 ```bash
-docker pull splunk/splunk:6.6.2
+docker pull splunk/splunk:6.6.3
 ```
 
 ### Pull an image that uses the latest version of Splunk Enterprise from this repository
@@ -52,13 +52,13 @@ docker pull splunk/splunk:latest
 This command starts a Splunk Enterprise instance from the Docker container in this repository, accepts the license agreement, and opens TCP port 8000 so that you can access the Splunk instance from your local machine.
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:6.6.2
+docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:6.6.3
 ```
 ### Start a Splunk Enterprise container and mount the necessary container volumes
 
 ```bash
 docker run --name vsplunk -v /opt/splunk/etc -v /opt/splunk/var busybox
-docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:6.6.2
+docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:6.6.3
 ```
 
 > Note:
@@ -70,7 +70,7 @@ docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -
 ### Start a Splunk Enterprise container and mount volumes from host
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:6.6.2
+docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:6.6.3
 ```
 
 ### Use entrypoint.sh to execute Splunk commands
@@ -131,7 +131,7 @@ You can also use entrypoint.sh to configure Splunk services with environment var
 
 The `splunk/splunk` image comes in several variants:
 
-`splunk/splunk:6.6.2`
+`splunk/splunk:6.6.3`
 This is the default Splunk Enterprise image.
 
 `splunk/splunk:6.5.3-monitor`
diff --git a/enterprise/build.sh b/enterprise/build.sh
index 3a94a51..947c08d 100755
--- a/enterprise/build.sh
+++ b/enterprise/build.sh
@@ -3,7 +3,7 @@ if [ -z $CURRENT ]; then
 	CURRENT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 fi
 
-docker build --no-cache=true -t splunk/splunk:6.6.2 .
-docker tag splunk/splunk:6.6.2 splunk/splunk:latest 
-docker tag splunk/splunk:6.6.2 registry.splunk.com/splunk/splunk:latest 
-docker tag splunk/splunk:6.6.2 registry.splunk.com/splunk/splunk:6.6.2 
\ No newline at end of file
+docker build --no-cache=true -t splunk/splunk:6.6.3 .
+docker tag splunk/splunk:6.6.3 splunk/splunk:latest 
+docker tag splunk/splunk:6.6.3 registry.splunk.com/splunk/splunk:latest 
+docker tag splunk/splunk:6.6.3 registry.splunk.com/splunk/splunk:6.6.3 
\ No newline at end of file
diff --git a/enterprise/docker-compose.yml b/enterprise/docker-compose.yml
index 3a3a333..6197832 100644
--- a/enterprise/docker-compose.yml
+++ b/enterprise/docker-compose.yml
@@ -1,7 +1,7 @@
 # must accept EULA the first time that the image is started
-# docker run splunk/enterprise:6.6.2
+# docker run splunk/enterprise:6.6.3
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/enterprisetrial:6.6.2
+# 1. docker run -it splunk/enterprisetrial:6.6.3
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
 # e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/enterprisetrial 
 
@@ -16,7 +16,7 @@ services:
   splunkenterprise:
     #build: .
     hostname: splunkenterprise
-    image: splunk/splunk:6.6.2
+    image: splunk/splunk:6.6.3
     environment:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997
diff --git a/enterprise/entrypoint.sh b/enterprise/entrypoint.sh
index 1a59c30..3e1126d 100644
--- a/enterprise/entrypoint.sh
+++ b/enterprise/entrypoint.sh
@@ -51,8 +51,8 @@ Splunk Enterprise
 
   Usage:
 
-    docker run -it splunk/enterprise:6.6.2
-    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:6.6.2
+    docker run -it splunk/enterprise:6.6.3
+    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:6.6.3
 
 EOF
     exit 1
diff --git a/enterprise/publishImage.sh b/enterprise/publishImage.sh
index ee1c3c0..347b94a 100755
--- a/enterprise/publishImage.sh
+++ b/enterprise/publishImage.sh
@@ -1,7 +1,7 @@
 
-docker push splunk/splunk:6.6.2
+docker push splunk/splunk:6.6.3
 docker push splunk/splunk:latest
-docker push registry.splunk.com/splunk/splunk:6.6.2
+docker push registry.splunk.com/splunk/splunk:6.6.3
 docker push registry.splunk.com/splunk/splunk:latest
 
 
diff --git a/universalforwarder/Dockerfile b/universalforwarder/Dockerfile
index 5cd2090..3286198 100644
--- a/universalforwarder/Dockerfile
+++ b/universalforwarder/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT universalforwarder
-ENV SPLUNK_VERSION 6.6.2
-ENV SPLUNK_BUILD 4b804538c686
+ENV SPLUNK_VERSION 6.6.3
+ENV SPLUNK_BUILD e21ee54bc796
 ENV SPLUNK_FILENAME splunkforwarder-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk
diff --git a/universalforwarder/README.md b/universalforwarder/README.md
index 6d99652..9c651db 100644
--- a/universalforwarder/README.md
+++ b/universalforwarder/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `6.6.2`, `latest` - Splunk universal forwarder base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `6.6.3`, `latest` - Splunk universal forwarder base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk universal forwarder with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/universalforwarder/Dockerfile)
 
 # What is the Splunk Universal Forwarder?
@@ -18,7 +18,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 6.6.2 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 6.6.3 image.<br>
 
    
    ```bash
@@ -49,14 +49,14 @@ The universal forwarder docker image can collect data from a host and send data
 The following commands are examples of how to pull and run the universal forwarder Docker image. They can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 ### Pull an image from this repository for the universal fowarder with the Docker data collection inputs
-The `6.6.2-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
+The `6.6.3-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
 
 ```bash
-docker pull splunk/universalforwarder:6.6.2-monitor
+docker pull splunk/universalforwarder:6.6.3-monitor
 ```
 
 ### Pull the latest version of the image from this repository
-The `6.6.2` and `latest` versions only have the forwarder and do not have any of the data inputs.
+The `6.6.3` and `latest` versions only have the forwarder and do not have any of the data inputs.
 =======
 The `6.5.3-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
 
@@ -136,7 +136,7 @@ You can also use entrypoint.sh to configure Splunk services with environment var
 
 The `splunk/universalforwarder` image comes in the following variants:
 
-`splunk/universalforwarder:6.6.2` and `splunk/universalforwarder:latest`
+`splunk/universalforwarder:6.6.3` and `splunk/universalforwarder:latest`
 This is the default universal forwarder image.
 
 `splunk/universalforwarder:6.5.3-monitor`
diff --git a/universalforwarder/build.sh b/universalforwarder/build.sh
index bad2b65..9135961 100755
--- a/universalforwarder/build.sh
+++ b/universalforwarder/build.sh
@@ -4,9 +4,9 @@ if [ -z $CURRENT ]; then
 fi
 
 
-docker build --no-cache=true -t splunk/universalforwarder:6.6.2 $CURRENT
-docker tag splunk/universalforwarder:6.6.2 splunk/universalforwarder:latest
-docker tag splunk/universalforwarder:6.6.2 registry.splunk.com/splunk/universalforwarder:6.6.2
-docker tag splunk/universalforwarder:6.6.2 registry.splunk.com/splunk/universalforwarder:latest
+docker build --no-cache=true -t splunk/universalforwarder:6.6.3 $CURRENT
+docker tag splunk/universalforwarder:6.6.3 splunk/universalforwarder:latest
+docker tag splunk/universalforwarder:6.6.3 registry.splunk.com/splunk/universalforwarder:6.6.3
+docker tag splunk/universalforwarder:6.6.3 registry.splunk.com/splunk/universalforwarder:latest
 
 
diff --git a/universalforwarder/docker-compose.yml b/universalforwarder/docker-compose.yml
index 5eae251..4a5630f 100644
--- a/universalforwarder/docker-compose.yml
+++ b/universalforwarder/docker-compose.yml
@@ -1,12 +1,12 @@
 # must accept EULA the first time that the image is started
 
-# docker run splunk/universalforwarder:6.6.2
+# docker run splunk/universalforwarder:6.6.3
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/universalforwarder:6.6.2
+# 1. docker run -it splunk/universalforwarder:6.6.3
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
-# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:6.6.2 
+# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:6.6.3 
 
-version: '3'
+version: '2'
 services:
   vsplunk_uf:
     image: busybox
@@ -16,7 +16,7 @@ services:
   splunkuniversalforwarder:
 #    build: .
     hostname: splunkuniversalforwarder
-    image: splunk/universalforwarder:6.6.2
+    image: splunk/universalforwarder:6.6.3
 #    environment:
 #      SPLUNK_START_ARGS: --accept-license
     volumes_from:
@@ -25,4 +25,4 @@ services:
       - "8000:8000"
       - "9997:9997"
       - "8088:8088"
-      - "1514:1514"
\ No newline at end of file
+      - "1514:1514"
diff --git a/universalforwarder/entrypoint.sh b/universalforwarder/entrypoint.sh
index 8bcb727..fdd188b 100644
--- a/universalforwarder/entrypoint.sh
+++ b/universalforwarder/entrypoint.sh
@@ -51,7 +51,7 @@ Splunk Forwarder
 
   Usage:
 
-    docker run -it splunk/universalforwarder:6.6.2
+    docker run -it splunk/universalforwarder:6.6.3
     docker run --env SPLUNK_START_ARGS="--accept-license" outcoldman/splunk:latest-forwarder
 
 EOF
diff --git a/universalforwarder/publishImage.sh b/universalforwarder/publishImage.sh
index 0fb26d8..8ead03b 100755
--- a/universalforwarder/publishImage.sh
+++ b/universalforwarder/publishImage.sh
@@ -1,5 +1,5 @@
 #https://docs.docker.com/mac/step_six/
-docker push splunk/universalforwarder:6.6.2
+docker push splunk/universalforwarder:6.6.3
 docker push splunk/universalforwarder:latest
 docker push registry.splunk.com/splunk/universalforwarder:latest
-docker push registry.splunk.com/splunk/universalforwarder:6.6.2
+docker push registry.splunk.com/splunk/universalforwarder:6.6.3

From a46791263744fd594645aaad8c08a00d77f184b6 Mon Sep 17 00:00:00 2001
From: Maarten Hoogcarspel <maarten@hoogcarspel.net>
Date: Tue, 22 Aug 2017 16:12:03 +0100
Subject: [PATCH 05/15] Update to docker-compose v3

---
 enterprise/docker-compose.yml         | 21 +++++++++++----------
 universalforwarder/docker-compose.yml | 14 +++++++++++---
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/enterprise/docker-compose.yml b/enterprise/docker-compose.yml
index 6197832..ca8121d 100644
--- a/enterprise/docker-compose.yml
+++ b/enterprise/docker-compose.yml
@@ -5,14 +5,14 @@
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
 # e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/enterprisetrial 
 
-# Support for Docker Compose v2, https://docs.docker.com/compose/overview/
-version: '2'
+# Support for Docker Compose v3, https://docs.docker.com/compose/overview/
+version: '3'
+
+volumes:
+  opt-splunk-etc:
+  opt-splunk-var:
+
 services:
-  vsplunk:
-    image: busybox
-    volumes:
-      - /opt/splunk/etc
-      - /opt/splunk/var
   splunkenterprise:
     #build: .
     hostname: splunkenterprise
@@ -21,10 +21,11 @@ services:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997
       SPLUNK_ADD: tcp 1514
-    volumes_from:
-      - vsplunk
+    volumes:
+      - opt-splunk-etc:/opt/splunk/etc
+      - opt-splunk-var:/opt/splunk/var
     ports:
       - "8000:8000"
       - "9997:9997"
       - "8088:8088"
-      - "1514:1514"
\ No newline at end of file
+      - "1514:1514"
diff --git a/universalforwarder/docker-compose.yml b/universalforwarder/docker-compose.yml
index 4a5630f..f8d961c 100644
--- a/universalforwarder/docker-compose.yml
+++ b/universalforwarder/docker-compose.yml
@@ -6,7 +6,13 @@
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
 # e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:6.6.3 
 
-version: '2'
+# Support for Docker Compose v3, https://docs.docker.com/compose/overview/
+version: '3'
+
+volumes:
+  opt-splunk-etc:
+  opt-splunk-var:
+
 services:
   vsplunk_uf:
     image: busybox
@@ -19,10 +25,12 @@ services:
     image: splunk/universalforwarder:6.6.3
 #    environment:
 #      SPLUNK_START_ARGS: --accept-license
-    volumes_from:
-      - vsplunk_uf
+    volumes:
+      - opt-splunk-etc:/opt/splunk/etc
+      - opt-splunk-var:/opt/splunk/var
     ports:
       - "8000:8000"
       - "9997:9997"
       - "8088:8088"
       - "1514:1514"
+

From 2cbebcc937d5d4fdcde2d317dbb0c568b437edf1 Mon Sep 17 00:00:00 2001
From: Maarten Hoogcarspel <maarten@hoogcarspel.net>
Date: Tue, 22 Aug 2017 16:25:25 +0100
Subject: [PATCH 06/15] Updated docker-compose to v3

---
 universalforwarder/docker-compose.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/universalforwarder/docker-compose.yml b/universalforwarder/docker-compose.yml
index f8d961c..e491d96 100644
--- a/universalforwarder/docker-compose.yml
+++ b/universalforwarder/docker-compose.yml
@@ -14,11 +14,6 @@ volumes:
   opt-splunk-var:
 
 services:
-  vsplunk_uf:
-    image: busybox
-    volumes:
-      - /opt/splunk/etc
-      - /opt/splunk/var
   splunkuniversalforwarder:
 #    build: .
     hostname: splunkuniversalforwarder

From fb57931b4afa9b3fd0b32b86731aebf595c92bf3 Mon Sep 17 00:00:00 2001
From: Michael Wilde <mwilde@splunk.com>
Date: Tue, 22 Aug 2017 11:08:10 -0500
Subject: [PATCH 07/15] updated readme files to comply with docker-compose.yml
 updates

---
 enterprise/README.md         | 50 +++++++++++++++++-------------------
 universalforwarder/README.md | 43 +++++++++++++++----------------
 2 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/enterprise/README.md b/enterprise/README.md
index a01ac19..56936dc 100644
--- a/enterprise/README.md
+++ b/enterprise/README.md
@@ -91,32 +91,30 @@ You can also use entrypoint.sh to configure Splunk services with environment var
 2. Open `docker-compose.yml` for editing.
 3. Insert the following block of text into the file.
   
-   ```
-   version: '3'
-   services:
-    vsplunk:
-        image: busybox
-        volumes:
-         - /opt/splunk/etc
-         - /opt/splunk/var
-        splunk:
-         image: splunk/splunk:6.5.3-monitor
-         hostname: splunkenterprise
-         environment:
-          SPLUNK_START_ARGS: --accept-license --answer-yes
-          SPLUNK_ENABLE_LISTEN: 9997
-          SPLUNK_ADD: tcp 1514
-          SPLUNK_USER: root
-         volumes_from:
-          - vsplunk
-         volumes:
-          - /var/lib/docker/containers:/host/containers:ro
-          - /var/run/docker.sock:/var/run/docker.sock:ro
-         ports:
-          - "8000:8000"
-          - "9997:9997"
-          - "8088:8088"
-          - "1514:1514"
+```
+version: '3'
+
+volumes:
+  opt-splunk-etc:
+  opt-splunk-var:
+
+services:
+  splunkenterprise:
+
+    hostname: splunkenterprise
+    image: splunk/splunk:6.6.3
+    environment:
+      SPLUNK_START_ARGS: --accept-license
+      SPLUNK_ENABLE_LISTEN: 9997
+      SPLUNK_ADD: tcp 1514
+    volumes:
+      - opt-splunk-etc:/opt/splunk/etc
+      - opt-splunk-var:/opt/splunk/var
+    ports:
+      - "8000:8000"
+      - "9997:9997"
+      - "8088:8088"
+      - "1514:1514"
    ```
 4. Save the file and close it.
 5. Run the `docker-compose` utility in the same directory.
diff --git a/universalforwarder/README.md b/universalforwarder/README.md
index 9c651db..0b6981d 100644
--- a/universalforwarder/README.md
+++ b/universalforwarder/README.md
@@ -101,28 +101,27 @@ You can also use entrypoint.sh to configure Splunk services with environment var
 0. Open `docker-compose.yml` for editing.
 0. Insert the following block of text into the file.
 
-   ```
-   version: '2'
-   services:
-    vsplunk_uf:
-     image: busybox
-     volumes:
-       - /opt/splunk/etc
-       - /opt/splunk/var
-
-    splunkuniversalforwarder:
-     image: splunk/splunkuniversalforwarder:6.5.3-monitor
-     hostname: splunkuniversalforwarder
-     environment:
-        SPLUNK_START_ARGS: --accept-license --answer-yes
-        SPLUNK_FORWARD_SERVER: splunkenterprise:9997
-        SPLUNK_USER: root
-     restart: always
-     volumes_from:
-       - vsplunk_uf
-     volumes:
-       - /var/lib/docker/containers:/host/containers:ro
-       - /var/run/docker.sock:/var/run/docker.sock:ro
+```
+version: '3'
+
+volumes:
+  opt-splunk-etc:
+  opt-splunk-var:
+
+services:
+  splunkuniversalforwarder:
+
+    hostname: splunkuniversalforwarder
+    image: splunk/universalforwarder:6.6.3
+    environment: SPLUNK_START_ARGS: --accept-license
+    volumes:
+      - opt-splunk-etc:/opt/splunk/etc
+      - opt-splunk-var:/opt/splunk/var
+    ports:
+      - "8000:8000"
+      - "9997:9997"
+      - "8088:8088"
+      - "1514:1514"
    ```
 0. Save the file and close it.
 0. Run the `docker-compose` utility.

From bdac674ed7e8d7e95c22206363360f4651f6e96f Mon Sep 17 00:00:00 2001
From: Denis Gladkikh <denis@gladkikh.email>
Date: Tue, 26 Sep 2017 18:55:51 -0700
Subject: [PATCH 08/15] Splunk 7.0.0

---
 CONTRIBUTING.md                       |  2 +-
 enterprise/Dockerfile                 |  6 +++---
 enterprise/README.md                  | 18 +++++++++---------
 enterprise/build.sh                   |  8 ++++----
 enterprise/docker-compose.yml         |  6 +++---
 enterprise/entrypoint.sh              |  4 ++--
 enterprise/publishImage.sh            |  4 ++--
 universalforwarder/Dockerfile         |  4 ++--
 universalforwarder/README.md          | 14 +++++++-------
 universalforwarder/build.sh           |  8 ++++----
 universalforwarder/docker-compose.yml |  8 ++++----
 universalforwarder/entrypoint.sh      |  4 ++--
 universalforwarder/publishImage.sh    |  4 ++--
 13 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 896ecda..a334cf6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ If you experience problems or see unexpected behavior with this project, create
 
 0. Version of this project you're using (ex: 1.5.0)
 0. Platform version (ex: Windows Server 2012 R2)
-0. Splunk version (ex: 6.6.3)
+0. Splunk version (ex: 7.0.0)
 0. Other relevant information (ex: local/remote environment, Splunk network configuration)
 
 Alternatively, if you have a Splunk question please ask on [Splunk Answers][answers].
diff --git a/enterprise/Dockerfile b/enterprise/Dockerfile
index e68c578..dbd26cd 100644
--- a/enterprise/Dockerfile
+++ b/enterprise/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT splunk
-ENV SPLUNK_VERSION 6.6.3
-ENV SPLUNK_BUILD e21ee54bc796
+ENV SPLUNK_VERSION 7.0.0
+ENV SPLUNK_BUILD c8a78efdd40f
 ENV SPLUNK_FILENAME splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk
@@ -56,4 +56,4 @@ WORKDIR /opt/splunk
 VOLUME [ "/opt/splunk/etc", "/opt/splunk/var" ]
 
 ENTRYPOINT ["/sbin/entrypoint.sh"]
-CMD ["start-service"]
\ No newline at end of file
+CMD ["start-service"]
diff --git a/enterprise/README.md b/enterprise/README.md
index 56936dc..3bae504 100644
--- a/enterprise/README.md
+++ b/enterprise/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `6.6.3`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `7.0.0`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk Enterprise with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/enterprise/Dockerfile)
 
 # What is Splunk Enterprise?
@@ -16,7 +16,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 6.6.3 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 7.0.0 image.<br>
    
    ```bash
    docker pull splunk/splunk
@@ -35,10 +35,10 @@ See [How to use the Splunk Enterprise Docker image](#How-to-use-the-Splunk-Enter
 The following commands can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 
-### Pull an image for version 6.6.3 of Splunk Enterprise from this repository
+### Pull an image for version 7.0.0 of Splunk Enterprise from this repository
 
 ```bash
-docker pull splunk/splunk:6.6.3
+docker pull splunk/splunk:7.0.0
 ```
 
 ### Pull an image that uses the latest version of Splunk Enterprise from this repository
@@ -52,13 +52,13 @@ docker pull splunk/splunk:latest
 This command starts a Splunk Enterprise instance from the Docker container in this repository, accepts the license agreement, and opens TCP port 8000 so that you can access the Splunk instance from your local machine.
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:6.6.3
+docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.0.0
 ```
 ### Start a Splunk Enterprise container and mount the necessary container volumes
 
 ```bash
 docker run --name vsplunk -v /opt/splunk/etc -v /opt/splunk/var busybox
-docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:6.6.3
+docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.0.0
 ```
 
 > Note:
@@ -70,7 +70,7 @@ docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -
 ### Start a Splunk Enterprise container and mount volumes from host
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:6.6.3
+docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:7.0.0
 ```
 
 ### Use entrypoint.sh to execute Splunk commands
@@ -102,7 +102,7 @@ services:
   splunkenterprise:
 
     hostname: splunkenterprise
-    image: splunk/splunk:6.6.3
+    image: splunk/splunk:7.0.0
     environment:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997
@@ -129,7 +129,7 @@ services:
 
 The `splunk/splunk` image comes in several variants:
 
-`splunk/splunk:6.6.3`
+`splunk/splunk:7.0.0`
 This is the default Splunk Enterprise image.
 
 `splunk/splunk:6.5.3-monitor`
diff --git a/enterprise/build.sh b/enterprise/build.sh
index 947c08d..b363f64 100755
--- a/enterprise/build.sh
+++ b/enterprise/build.sh
@@ -3,7 +3,7 @@ if [ -z $CURRENT ]; then
 	CURRENT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 fi
 
-docker build --no-cache=true -t splunk/splunk:6.6.3 .
-docker tag splunk/splunk:6.6.3 splunk/splunk:latest 
-docker tag splunk/splunk:6.6.3 registry.splunk.com/splunk/splunk:latest 
-docker tag splunk/splunk:6.6.3 registry.splunk.com/splunk/splunk:6.6.3 
\ No newline at end of file
+docker build --no-cache=true -t splunk/splunk:7.0.0 .
+docker tag splunk/splunk:7.0.0 splunk/splunk:latest 
+docker tag splunk/splunk:7.0.0 registry.splunk.com/splunk/splunk:latest 
+docker tag splunk/splunk:7.0.0 registry.splunk.com/splunk/splunk:7.0.0 
diff --git a/enterprise/docker-compose.yml b/enterprise/docker-compose.yml
index ca8121d..bb099b1 100644
--- a/enterprise/docker-compose.yml
+++ b/enterprise/docker-compose.yml
@@ -1,7 +1,7 @@
 # must accept EULA the first time that the image is started
-# docker run splunk/enterprise:6.6.3
+# docker run splunk/enterprise:7.0.0
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/enterprisetrial:6.6.3
+# 1. docker run -it splunk/enterprisetrial:7.0.0
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
 # e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/enterprisetrial 
 
@@ -16,7 +16,7 @@ services:
   splunkenterprise:
     #build: .
     hostname: splunkenterprise
-    image: splunk/splunk:6.6.3
+    image: splunk/splunk:7.0.0
     environment:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997
diff --git a/enterprise/entrypoint.sh b/enterprise/entrypoint.sh
index 3e1126d..da1cd1f 100644
--- a/enterprise/entrypoint.sh
+++ b/enterprise/entrypoint.sh
@@ -51,8 +51,8 @@ Splunk Enterprise
 
   Usage:
 
-    docker run -it splunk/enterprise:6.6.3
-    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:6.6.3
+    docker run -it splunk/enterprise:7.0.0
+    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:7.0.0
 
 EOF
     exit 1
diff --git a/enterprise/publishImage.sh b/enterprise/publishImage.sh
index 347b94a..57d2aee 100755
--- a/enterprise/publishImage.sh
+++ b/enterprise/publishImage.sh
@@ -1,7 +1,7 @@
 
-docker push splunk/splunk:6.6.3
+docker push splunk/splunk:7.0.0
 docker push splunk/splunk:latest
-docker push registry.splunk.com/splunk/splunk:6.6.3
+docker push registry.splunk.com/splunk/splunk:7.0.0
 docker push registry.splunk.com/splunk/splunk:latest
 
 
diff --git a/universalforwarder/Dockerfile b/universalforwarder/Dockerfile
index 3286198..e0ea486 100644
--- a/universalforwarder/Dockerfile
+++ b/universalforwarder/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT universalforwarder
-ENV SPLUNK_VERSION 6.6.3
-ENV SPLUNK_BUILD e21ee54bc796
+ENV SPLUNK_VERSION 7.0.0
+ENV SPLUNK_BUILD c8a78efdd40f
 ENV SPLUNK_FILENAME splunkforwarder-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk
diff --git a/universalforwarder/README.md b/universalforwarder/README.md
index 0b6981d..a19ff13 100644
--- a/universalforwarder/README.md
+++ b/universalforwarder/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `6.6.3`, `latest` - Splunk universal forwarder base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `7.0.0`, `latest` - Splunk universal forwarder base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk universal forwarder with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/universalforwarder/Dockerfile)
 
 # What is the Splunk Universal Forwarder?
@@ -18,7 +18,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 6.6.3 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 7.0.0 image.<br>
 
    
    ```bash
@@ -49,14 +49,14 @@ The universal forwarder docker image can collect data from a host and send data
 The following commands are examples of how to pull and run the universal forwarder Docker image. They can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 ### Pull an image from this repository for the universal fowarder with the Docker data collection inputs
-The `6.6.3-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
+The `7.0.0-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
 
 ```bash
-docker pull splunk/universalforwarder:6.6.3-monitor
+docker pull splunk/universalforwarder:7.0.0-monitor
 ```
 
 ### Pull the latest version of the image from this repository
-The `6.6.3` and `latest` versions only have the forwarder and do not have any of the data inputs.
+The `7.0.0` and `latest` versions only have the forwarder and do not have any of the data inputs.
 =======
 The `6.5.3-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
 
@@ -112,7 +112,7 @@ services:
   splunkuniversalforwarder:
 
     hostname: splunkuniversalforwarder
-    image: splunk/universalforwarder:6.6.3
+    image: splunk/universalforwarder:7.0.0
     environment: SPLUNK_START_ARGS: --accept-license
     volumes:
       - opt-splunk-etc:/opt/splunk/etc
@@ -135,7 +135,7 @@ services:
 
 The `splunk/universalforwarder` image comes in the following variants:
 
-`splunk/universalforwarder:6.6.3` and `splunk/universalforwarder:latest`
+`splunk/universalforwarder:7.0.0` and `splunk/universalforwarder:latest`
 This is the default universal forwarder image.
 
 `splunk/universalforwarder:6.5.3-monitor`
diff --git a/universalforwarder/build.sh b/universalforwarder/build.sh
index 9135961..37e1627 100755
--- a/universalforwarder/build.sh
+++ b/universalforwarder/build.sh
@@ -4,9 +4,9 @@ if [ -z $CURRENT ]; then
 fi
 
 
-docker build --no-cache=true -t splunk/universalforwarder:6.6.3 $CURRENT
-docker tag splunk/universalforwarder:6.6.3 splunk/universalforwarder:latest
-docker tag splunk/universalforwarder:6.6.3 registry.splunk.com/splunk/universalforwarder:6.6.3
-docker tag splunk/universalforwarder:6.6.3 registry.splunk.com/splunk/universalforwarder:latest
+docker build --no-cache=true -t splunk/universalforwarder:7.0.0 $CURRENT
+docker tag splunk/universalforwarder:7.0.0 splunk/universalforwarder:latest
+docker tag splunk/universalforwarder:7.0.0 registry.splunk.com/splunk/universalforwarder:7.0.0
+docker tag splunk/universalforwarder:7.0.0 registry.splunk.com/splunk/universalforwarder:latest
 
 
diff --git a/universalforwarder/docker-compose.yml b/universalforwarder/docker-compose.yml
index e491d96..ffe1129 100644
--- a/universalforwarder/docker-compose.yml
+++ b/universalforwarder/docker-compose.yml
@@ -1,10 +1,10 @@
 # must accept EULA the first time that the image is started
 
-# docker run splunk/universalforwarder:6.6.3
+# docker run splunk/universalforwarder:7.0.0
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/universalforwarder:6.6.3
+# 1. docker run -it splunk/universalforwarder:7.0.0
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
-# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:6.6.3 
+# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:7.0.0 
 
 # Support for Docker Compose v3, https://docs.docker.com/compose/overview/
 version: '3'
@@ -17,7 +17,7 @@ services:
   splunkuniversalforwarder:
 #    build: .
     hostname: splunkuniversalforwarder
-    image: splunk/universalforwarder:6.6.3
+    image: splunk/universalforwarder:7.0.0
 #    environment:
 #      SPLUNK_START_ARGS: --accept-license
     volumes:
diff --git a/universalforwarder/entrypoint.sh b/universalforwarder/entrypoint.sh
index fdd188b..500bf55 100644
--- a/universalforwarder/entrypoint.sh
+++ b/universalforwarder/entrypoint.sh
@@ -51,7 +51,7 @@ Splunk Forwarder
 
   Usage:
 
-    docker run -it splunk/universalforwarder:6.6.3
+    docker run -it splunk/universalforwarder:7.0.0
     docker run --env SPLUNK_START_ARGS="--accept-license" outcoldman/splunk:latest-forwarder
 
 EOF
@@ -140,4 +140,4 @@ elif [ "$1" = 'splunk-bash' ]; then
   sudo -u ${SPLUNK_USER} /bin/bash --init-file ${SPLUNK_HOME}/bin/setSplunkEnv
 else
   "$@"
-fi
\ No newline at end of file
+fi
diff --git a/universalforwarder/publishImage.sh b/universalforwarder/publishImage.sh
index 8ead03b..7cd298d 100755
--- a/universalforwarder/publishImage.sh
+++ b/universalforwarder/publishImage.sh
@@ -1,5 +1,5 @@
 #https://docs.docker.com/mac/step_six/
-docker push splunk/universalforwarder:6.6.3
+docker push splunk/universalforwarder:7.0.0
 docker push splunk/universalforwarder:latest
 docker push registry.splunk.com/splunk/universalforwarder:latest
-docker push registry.splunk.com/splunk/universalforwarder:6.6.3
+docker push registry.splunk.com/splunk/universalforwarder:7.0.0

From 4de008b07af641e543157d18e00bf9399a6fe06e Mon Sep 17 00:00:00 2001
From: "Michael S. Wilde" <thewilde@splunk.com>
Date: Wed, 24 Jan 2018 14:48:51 -0600
Subject: [PATCH 09/15] Merge pull request #61 from outcoldman/pr-7.0.1

Splunk 7.0.1
---
 CONTRIBUTING.md                       |  2 +-
 enterprise/Dockerfile                 |  4 ++--
 enterprise/README.md                  | 18 +++++++++---------
 enterprise/build.sh                   |  8 ++++----
 enterprise/docker-compose.yml         |  6 +++---
 enterprise/entrypoint.sh              |  4 ++--
 enterprise/publishImage.sh            |  4 ++--
 universalforwarder/Dockerfile         |  4 ++--
 universalforwarder/README.md          | 14 +++++++-------
 universalforwarder/build.sh           |  8 ++++----
 universalforwarder/docker-compose.yml |  8 ++++----
 universalforwarder/entrypoint.sh      |  2 +-
 universalforwarder/publishImage.sh    |  4 ++--
 13 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a334cf6..eb01bb3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ If you experience problems or see unexpected behavior with this project, create
 
 0. Version of this project you're using (ex: 1.5.0)
 0. Platform version (ex: Windows Server 2012 R2)
-0. Splunk version (ex: 7.0.0)
+0. Splunk version (ex: 7.0.1)
 0. Other relevant information (ex: local/remote environment, Splunk network configuration)
 
 Alternatively, if you have a Splunk question please ask on [Splunk Answers][answers].
diff --git a/enterprise/Dockerfile b/enterprise/Dockerfile
index dbd26cd..696e5ca 100644
--- a/enterprise/Dockerfile
+++ b/enterprise/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT splunk
-ENV SPLUNK_VERSION 7.0.0
-ENV SPLUNK_BUILD c8a78efdd40f
+ENV SPLUNK_VERSION 7.0.1
+ENV SPLUNK_BUILD 2b5b15c4ee89
 ENV SPLUNK_FILENAME splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk
diff --git a/enterprise/README.md b/enterprise/README.md
index 3bae504..104013d 100644
--- a/enterprise/README.md
+++ b/enterprise/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `7.0.0`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `7.0.1`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk Enterprise with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/enterprise/Dockerfile)
 
 # What is Splunk Enterprise?
@@ -16,7 +16,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 7.0.0 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 7.0.1 image.<br>
    
    ```bash
    docker pull splunk/splunk
@@ -35,10 +35,10 @@ See [How to use the Splunk Enterprise Docker image](#How-to-use-the-Splunk-Enter
 The following commands can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 
-### Pull an image for version 7.0.0 of Splunk Enterprise from this repository
+### Pull an image for version 7.0.1 of Splunk Enterprise from this repository
 
 ```bash
-docker pull splunk/splunk:7.0.0
+docker pull splunk/splunk:7.0.1
 ```
 
 ### Pull an image that uses the latest version of Splunk Enterprise from this repository
@@ -52,13 +52,13 @@ docker pull splunk/splunk:latest
 This command starts a Splunk Enterprise instance from the Docker container in this repository, accepts the license agreement, and opens TCP port 8000 so that you can access the Splunk instance from your local machine.
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.0.0
+docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.0.1
 ```
 ### Start a Splunk Enterprise container and mount the necessary container volumes
 
 ```bash
 docker run --name vsplunk -v /opt/splunk/etc -v /opt/splunk/var busybox
-docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.0.0
+docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.0.1
 ```
 
 > Note:
@@ -70,7 +70,7 @@ docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -
 ### Start a Splunk Enterprise container and mount volumes from host
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:7.0.0
+docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:7.0.1
 ```
 
 ### Use entrypoint.sh to execute Splunk commands
@@ -102,7 +102,7 @@ services:
   splunkenterprise:
 
     hostname: splunkenterprise
-    image: splunk/splunk:7.0.0
+    image: splunk/splunk:7.0.1
     environment:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997
@@ -129,7 +129,7 @@ services:
 
 The `splunk/splunk` image comes in several variants:
 
-`splunk/splunk:7.0.0`
+`splunk/splunk:7.0.1`
 This is the default Splunk Enterprise image.
 
 `splunk/splunk:6.5.3-monitor`
diff --git a/enterprise/build.sh b/enterprise/build.sh
index b363f64..5810b2b 100755
--- a/enterprise/build.sh
+++ b/enterprise/build.sh
@@ -3,7 +3,7 @@ if [ -z $CURRENT ]; then
 	CURRENT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 fi
 
-docker build --no-cache=true -t splunk/splunk:7.0.0 .
-docker tag splunk/splunk:7.0.0 splunk/splunk:latest 
-docker tag splunk/splunk:7.0.0 registry.splunk.com/splunk/splunk:latest 
-docker tag splunk/splunk:7.0.0 registry.splunk.com/splunk/splunk:7.0.0 
+docker build --no-cache=true -t splunk/splunk:7.0.1 .
+docker tag splunk/splunk:7.0.1 splunk/splunk:latest 
+docker tag splunk/splunk:7.0.1 registry.splunk.com/splunk/splunk:latest 
+docker tag splunk/splunk:7.0.1 registry.splunk.com/splunk/splunk:7.0.1 
diff --git a/enterprise/docker-compose.yml b/enterprise/docker-compose.yml
index bb099b1..2dc1128 100644
--- a/enterprise/docker-compose.yml
+++ b/enterprise/docker-compose.yml
@@ -1,7 +1,7 @@
 # must accept EULA the first time that the image is started
-# docker run splunk/enterprise:7.0.0
+# docker run splunk/enterprise:7.0.1
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/enterprisetrial:7.0.0
+# 1. docker run -it splunk/enterprisetrial:7.0.1
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
 # e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/enterprisetrial 
 
@@ -16,7 +16,7 @@ services:
   splunkenterprise:
     #build: .
     hostname: splunkenterprise
-    image: splunk/splunk:7.0.0
+    image: splunk/splunk:7.0.1
     environment:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997
diff --git a/enterprise/entrypoint.sh b/enterprise/entrypoint.sh
index da1cd1f..716ff34 100644
--- a/enterprise/entrypoint.sh
+++ b/enterprise/entrypoint.sh
@@ -51,8 +51,8 @@ Splunk Enterprise
 
   Usage:
 
-    docker run -it splunk/enterprise:7.0.0
-    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:7.0.0
+    docker run -it splunk/enterprise:7.0.1
+    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:7.0.1
 
 EOF
     exit 1
diff --git a/enterprise/publishImage.sh b/enterprise/publishImage.sh
index 57d2aee..360482f 100755
--- a/enterprise/publishImage.sh
+++ b/enterprise/publishImage.sh
@@ -1,7 +1,7 @@
 
-docker push splunk/splunk:7.0.0
+docker push splunk/splunk:7.0.1
 docker push splunk/splunk:latest
-docker push registry.splunk.com/splunk/splunk:7.0.0
+docker push registry.splunk.com/splunk/splunk:7.0.1
 docker push registry.splunk.com/splunk/splunk:latest
 
 
diff --git a/universalforwarder/Dockerfile b/universalforwarder/Dockerfile
index e0ea486..3d10b36 100644
--- a/universalforwarder/Dockerfile
+++ b/universalforwarder/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT universalforwarder
-ENV SPLUNK_VERSION 7.0.0
-ENV SPLUNK_BUILD c8a78efdd40f
+ENV SPLUNK_VERSION 7.0.1
+ENV SPLUNK_BUILD 2b5b15c4ee89
 ENV SPLUNK_FILENAME splunkforwarder-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk
diff --git a/universalforwarder/README.md b/universalforwarder/README.md
index a19ff13..391cdcf 100644
--- a/universalforwarder/README.md
+++ b/universalforwarder/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `7.0.0`, `latest` - Splunk universal forwarder base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `7.0.1`, `latest` - Splunk universal forwarder base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk universal forwarder with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/universalforwarder/Dockerfile)
 
 # What is the Splunk Universal Forwarder?
@@ -18,7 +18,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 7.0.0 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 7.0.1 image.<br>
 
    
    ```bash
@@ -49,14 +49,14 @@ The universal forwarder docker image can collect data from a host and send data
 The following commands are examples of how to pull and run the universal forwarder Docker image. They can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 ### Pull an image from this repository for the universal fowarder with the Docker data collection inputs
-The `7.0.0-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
+The `7.0.1-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
 
 ```bash
-docker pull splunk/universalforwarder:7.0.0-monitor
+docker pull splunk/universalforwarder:7.0.1-monitor
 ```
 
 ### Pull the latest version of the image from this repository
-The `7.0.0` and `latest` versions only have the forwarder and do not have any of the data inputs.
+The `7.0.1` and `latest` versions only have the forwarder and do not have any of the data inputs.
 =======
 The `6.5.3-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
 
@@ -112,7 +112,7 @@ services:
   splunkuniversalforwarder:
 
     hostname: splunkuniversalforwarder
-    image: splunk/universalforwarder:7.0.0
+    image: splunk/universalforwarder:7.0.1
     environment: SPLUNK_START_ARGS: --accept-license
     volumes:
       - opt-splunk-etc:/opt/splunk/etc
@@ -135,7 +135,7 @@ services:
 
 The `splunk/universalforwarder` image comes in the following variants:
 
-`splunk/universalforwarder:7.0.0` and `splunk/universalforwarder:latest`
+`splunk/universalforwarder:7.0.1` and `splunk/universalforwarder:latest`
 This is the default universal forwarder image.
 
 `splunk/universalforwarder:6.5.3-monitor`
diff --git a/universalforwarder/build.sh b/universalforwarder/build.sh
index 37e1627..3612261 100755
--- a/universalforwarder/build.sh
+++ b/universalforwarder/build.sh
@@ -4,9 +4,9 @@ if [ -z $CURRENT ]; then
 fi
 
 
-docker build --no-cache=true -t splunk/universalforwarder:7.0.0 $CURRENT
-docker tag splunk/universalforwarder:7.0.0 splunk/universalforwarder:latest
-docker tag splunk/universalforwarder:7.0.0 registry.splunk.com/splunk/universalforwarder:7.0.0
-docker tag splunk/universalforwarder:7.0.0 registry.splunk.com/splunk/universalforwarder:latest
+docker build --no-cache=true -t splunk/universalforwarder:7.0.1 $CURRENT
+docker tag splunk/universalforwarder:7.0.1 splunk/universalforwarder:latest
+docker tag splunk/universalforwarder:7.0.1 registry.splunk.com/splunk/universalforwarder:7.0.1
+docker tag splunk/universalforwarder:7.0.1 registry.splunk.com/splunk/universalforwarder:latest
 
 
diff --git a/universalforwarder/docker-compose.yml b/universalforwarder/docker-compose.yml
index ffe1129..345773d 100644
--- a/universalforwarder/docker-compose.yml
+++ b/universalforwarder/docker-compose.yml
@@ -1,10 +1,10 @@
 # must accept EULA the first time that the image is started
 
-# docker run splunk/universalforwarder:7.0.0
+# docker run splunk/universalforwarder:7.0.1
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/universalforwarder:7.0.0
+# 1. docker run -it splunk/universalforwarder:7.0.1
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
-# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:7.0.0 
+# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:7.0.1 
 
 # Support for Docker Compose v3, https://docs.docker.com/compose/overview/
 version: '3'
@@ -17,7 +17,7 @@ services:
   splunkuniversalforwarder:
 #    build: .
     hostname: splunkuniversalforwarder
-    image: splunk/universalforwarder:7.0.0
+    image: splunk/universalforwarder:7.0.1
 #    environment:
 #      SPLUNK_START_ARGS: --accept-license
     volumes:
diff --git a/universalforwarder/entrypoint.sh b/universalforwarder/entrypoint.sh
index 500bf55..2d6cb14 100644
--- a/universalforwarder/entrypoint.sh
+++ b/universalforwarder/entrypoint.sh
@@ -51,7 +51,7 @@ Splunk Forwarder
 
   Usage:
 
-    docker run -it splunk/universalforwarder:7.0.0
+    docker run -it splunk/universalforwarder:7.0.1
     docker run --env SPLUNK_START_ARGS="--accept-license" outcoldman/splunk:latest-forwarder
 
 EOF
diff --git a/universalforwarder/publishImage.sh b/universalforwarder/publishImage.sh
index 7cd298d..a8af131 100755
--- a/universalforwarder/publishImage.sh
+++ b/universalforwarder/publishImage.sh
@@ -1,5 +1,5 @@
 #https://docs.docker.com/mac/step_six/
-docker push splunk/universalforwarder:7.0.0
+docker push splunk/universalforwarder:7.0.1
 docker push splunk/universalforwarder:latest
 docker push registry.splunk.com/splunk/universalforwarder:latest
-docker push registry.splunk.com/splunk/universalforwarder:7.0.0
+docker push registry.splunk.com/splunk/universalforwarder:7.0.1

From cca695b09228a0039b8a1bded035fb19d71b48b7 Mon Sep 17 00:00:00 2001
From: Denis Gladkikh <denis@gladkikh.email>
Date: Mon, 29 Jan 2018 18:07:02 -0800
Subject: [PATCH 10/15] Splunk 7.0.2

---
 CONTRIBUTING.md                       |  2 +-
 enterprise/Dockerfile                 |  4 ++--
 enterprise/README.md                  | 18 +++++++++---------
 enterprise/build.sh                   |  8 ++++----
 enterprise/docker-compose.yml         |  6 +++---
 enterprise/entrypoint.sh              |  4 ++--
 enterprise/publishImage.sh            |  4 ++--
 universalforwarder/Dockerfile         |  4 ++--
 universalforwarder/README.md          | 14 +++++++-------
 universalforwarder/build.sh           |  8 ++++----
 universalforwarder/docker-compose.yml |  8 ++++----
 universalforwarder/entrypoint.sh      |  2 +-
 universalforwarder/publishImage.sh    |  4 ++--
 13 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index eb01bb3..5c9a034 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ If you experience problems or see unexpected behavior with this project, create
 
 0. Version of this project you're using (ex: 1.5.0)
 0. Platform version (ex: Windows Server 2012 R2)
-0. Splunk version (ex: 7.0.1)
+0. Splunk version (ex: 7.0.2)
 0. Other relevant information (ex: local/remote environment, Splunk network configuration)
 
 Alternatively, if you have a Splunk question please ask on [Splunk Answers][answers].
diff --git a/enterprise/Dockerfile b/enterprise/Dockerfile
index 696e5ca..78aa03b 100644
--- a/enterprise/Dockerfile
+++ b/enterprise/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT splunk
-ENV SPLUNK_VERSION 7.0.1
-ENV SPLUNK_BUILD 2b5b15c4ee89
+ENV SPLUNK_VERSION 7.0.2
+ENV SPLUNK_BUILD 03bbabbd5c0f
 ENV SPLUNK_FILENAME splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk
diff --git a/enterprise/README.md b/enterprise/README.md
index 104013d..27f4620 100644
--- a/enterprise/README.md
+++ b/enterprise/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `7.0.1`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `7.0.2`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk Enterprise with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/enterprise/Dockerfile)
 
 # What is Splunk Enterprise?
@@ -16,7 +16,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 7.0.1 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 7.0.2 image.<br>
    
    ```bash
    docker pull splunk/splunk
@@ -35,10 +35,10 @@ See [How to use the Splunk Enterprise Docker image](#How-to-use-the-Splunk-Enter
 The following commands can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 
-### Pull an image for version 7.0.1 of Splunk Enterprise from this repository
+### Pull an image for version 7.0.2 of Splunk Enterprise from this repository
 
 ```bash
-docker pull splunk/splunk:7.0.1
+docker pull splunk/splunk:7.0.2
 ```
 
 ### Pull an image that uses the latest version of Splunk Enterprise from this repository
@@ -52,13 +52,13 @@ docker pull splunk/splunk:latest
 This command starts a Splunk Enterprise instance from the Docker container in this repository, accepts the license agreement, and opens TCP port 8000 so that you can access the Splunk instance from your local machine.
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.0.1
+docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.0.2
 ```
 ### Start a Splunk Enterprise container and mount the necessary container volumes
 
 ```bash
 docker run --name vsplunk -v /opt/splunk/etc -v /opt/splunk/var busybox
-docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.0.1
+docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.0.2
 ```
 
 > Note:
@@ -70,7 +70,7 @@ docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -
 ### Start a Splunk Enterprise container and mount volumes from host
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:7.0.1
+docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:7.0.2
 ```
 
 ### Use entrypoint.sh to execute Splunk commands
@@ -102,7 +102,7 @@ services:
   splunkenterprise:
 
     hostname: splunkenterprise
-    image: splunk/splunk:7.0.1
+    image: splunk/splunk:7.0.2
     environment:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997
@@ -129,7 +129,7 @@ services:
 
 The `splunk/splunk` image comes in several variants:
 
-`splunk/splunk:7.0.1`
+`splunk/splunk:7.0.2`
 This is the default Splunk Enterprise image.
 
 `splunk/splunk:6.5.3-monitor`
diff --git a/enterprise/build.sh b/enterprise/build.sh
index 5810b2b..aa98bb2 100755
--- a/enterprise/build.sh
+++ b/enterprise/build.sh
@@ -3,7 +3,7 @@ if [ -z $CURRENT ]; then
 	CURRENT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 fi
 
-docker build --no-cache=true -t splunk/splunk:7.0.1 .
-docker tag splunk/splunk:7.0.1 splunk/splunk:latest 
-docker tag splunk/splunk:7.0.1 registry.splunk.com/splunk/splunk:latest 
-docker tag splunk/splunk:7.0.1 registry.splunk.com/splunk/splunk:7.0.1 
+docker build --no-cache=true -t splunk/splunk:7.0.2 .
+docker tag splunk/splunk:7.0.2 splunk/splunk:latest 
+docker tag splunk/splunk:7.0.2 registry.splunk.com/splunk/splunk:latest 
+docker tag splunk/splunk:7.0.2 registry.splunk.com/splunk/splunk:7.0.2 
diff --git a/enterprise/docker-compose.yml b/enterprise/docker-compose.yml
index 2dc1128..6a23b07 100644
--- a/enterprise/docker-compose.yml
+++ b/enterprise/docker-compose.yml
@@ -1,7 +1,7 @@
 # must accept EULA the first time that the image is started
-# docker run splunk/enterprise:7.0.1
+# docker run splunk/enterprise:7.0.2
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/enterprisetrial:7.0.1
+# 1. docker run -it splunk/enterprisetrial:7.0.2
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
 # e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/enterprisetrial 
 
@@ -16,7 +16,7 @@ services:
   splunkenterprise:
     #build: .
     hostname: splunkenterprise
-    image: splunk/splunk:7.0.1
+    image: splunk/splunk:7.0.2
     environment:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997
diff --git a/enterprise/entrypoint.sh b/enterprise/entrypoint.sh
index 716ff34..38f7ca1 100644
--- a/enterprise/entrypoint.sh
+++ b/enterprise/entrypoint.sh
@@ -51,8 +51,8 @@ Splunk Enterprise
 
   Usage:
 
-    docker run -it splunk/enterprise:7.0.1
-    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:7.0.1
+    docker run -it splunk/enterprise:7.0.2
+    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:7.0.2
 
 EOF
     exit 1
diff --git a/enterprise/publishImage.sh b/enterprise/publishImage.sh
index 360482f..8c01ad2 100755
--- a/enterprise/publishImage.sh
+++ b/enterprise/publishImage.sh
@@ -1,7 +1,7 @@
 
-docker push splunk/splunk:7.0.1
+docker push splunk/splunk:7.0.2
 docker push splunk/splunk:latest
-docker push registry.splunk.com/splunk/splunk:7.0.1
+docker push registry.splunk.com/splunk/splunk:7.0.2
 docker push registry.splunk.com/splunk/splunk:latest
 
 
diff --git a/universalforwarder/Dockerfile b/universalforwarder/Dockerfile
index 3d10b36..2e3deb3 100644
--- a/universalforwarder/Dockerfile
+++ b/universalforwarder/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT universalforwarder
-ENV SPLUNK_VERSION 7.0.1
-ENV SPLUNK_BUILD 2b5b15c4ee89
+ENV SPLUNK_VERSION 7.0.2
+ENV SPLUNK_BUILD 03bbabbd5c0f
 ENV SPLUNK_FILENAME splunkforwarder-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk
diff --git a/universalforwarder/README.md b/universalforwarder/README.md
index 391cdcf..6f82feb 100644
--- a/universalforwarder/README.md
+++ b/universalforwarder/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `7.0.1`, `latest` - Splunk universal forwarder base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `7.0.2`, `latest` - Splunk universal forwarder base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk universal forwarder with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/universalforwarder/Dockerfile)
 
 # What is the Splunk Universal Forwarder?
@@ -18,7 +18,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 7.0.1 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 7.0.2 image.<br>
 
    
    ```bash
@@ -49,14 +49,14 @@ The universal forwarder docker image can collect data from a host and send data
 The following commands are examples of how to pull and run the universal forwarder Docker image. They can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 ### Pull an image from this repository for the universal fowarder with the Docker data collection inputs
-The `7.0.1-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
+The `7.0.2-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
 
 ```bash
-docker pull splunk/universalforwarder:7.0.1-monitor
+docker pull splunk/universalforwarder:7.0.2-monitor
 ```
 
 ### Pull the latest version of the image from this repository
-The `7.0.1` and `latest` versions only have the forwarder and do not have any of the data inputs.
+The `7.0.2` and `latest` versions only have the forwarder and do not have any of the data inputs.
 =======
 The `6.5.3-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
 
@@ -112,7 +112,7 @@ services:
   splunkuniversalforwarder:
 
     hostname: splunkuniversalforwarder
-    image: splunk/universalforwarder:7.0.1
+    image: splunk/universalforwarder:7.0.2
     environment: SPLUNK_START_ARGS: --accept-license
     volumes:
       - opt-splunk-etc:/opt/splunk/etc
@@ -135,7 +135,7 @@ services:
 
 The `splunk/universalforwarder` image comes in the following variants:
 
-`splunk/universalforwarder:7.0.1` and `splunk/universalforwarder:latest`
+`splunk/universalforwarder:7.0.2` and `splunk/universalforwarder:latest`
 This is the default universal forwarder image.
 
 `splunk/universalforwarder:6.5.3-monitor`
diff --git a/universalforwarder/build.sh b/universalforwarder/build.sh
index 3612261..ef639b9 100755
--- a/universalforwarder/build.sh
+++ b/universalforwarder/build.sh
@@ -4,9 +4,9 @@ if [ -z $CURRENT ]; then
 fi
 
 
-docker build --no-cache=true -t splunk/universalforwarder:7.0.1 $CURRENT
-docker tag splunk/universalforwarder:7.0.1 splunk/universalforwarder:latest
-docker tag splunk/universalforwarder:7.0.1 registry.splunk.com/splunk/universalforwarder:7.0.1
-docker tag splunk/universalforwarder:7.0.1 registry.splunk.com/splunk/universalforwarder:latest
+docker build --no-cache=true -t splunk/universalforwarder:7.0.2 $CURRENT
+docker tag splunk/universalforwarder:7.0.2 splunk/universalforwarder:latest
+docker tag splunk/universalforwarder:7.0.2 registry.splunk.com/splunk/universalforwarder:7.0.2
+docker tag splunk/universalforwarder:7.0.2 registry.splunk.com/splunk/universalforwarder:latest
 
 
diff --git a/universalforwarder/docker-compose.yml b/universalforwarder/docker-compose.yml
index 345773d..54ad456 100644
--- a/universalforwarder/docker-compose.yml
+++ b/universalforwarder/docker-compose.yml
@@ -1,10 +1,10 @@
 # must accept EULA the first time that the image is started
 
-# docker run splunk/universalforwarder:7.0.1
+# docker run splunk/universalforwarder:7.0.2
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/universalforwarder:7.0.1
+# 1. docker run -it splunk/universalforwarder:7.0.2
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
-# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:7.0.1 
+# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:7.0.2 
 
 # Support for Docker Compose v3, https://docs.docker.com/compose/overview/
 version: '3'
@@ -17,7 +17,7 @@ services:
   splunkuniversalforwarder:
 #    build: .
     hostname: splunkuniversalforwarder
-    image: splunk/universalforwarder:7.0.1
+    image: splunk/universalforwarder:7.0.2
 #    environment:
 #      SPLUNK_START_ARGS: --accept-license
     volumes:
diff --git a/universalforwarder/entrypoint.sh b/universalforwarder/entrypoint.sh
index 2d6cb14..30fd7c8 100644
--- a/universalforwarder/entrypoint.sh
+++ b/universalforwarder/entrypoint.sh
@@ -51,7 +51,7 @@ Splunk Forwarder
 
   Usage:
 
-    docker run -it splunk/universalforwarder:7.0.1
+    docker run -it splunk/universalforwarder:7.0.2
     docker run --env SPLUNK_START_ARGS="--accept-license" outcoldman/splunk:latest-forwarder
 
 EOF
diff --git a/universalforwarder/publishImage.sh b/universalforwarder/publishImage.sh
index a8af131..14768ce 100755
--- a/universalforwarder/publishImage.sh
+++ b/universalforwarder/publishImage.sh
@@ -1,5 +1,5 @@
 #https://docs.docker.com/mac/step_six/
-docker push splunk/universalforwarder:7.0.1
+docker push splunk/universalforwarder:7.0.2
 docker push splunk/universalforwarder:latest
 docker push registry.splunk.com/splunk/universalforwarder:latest
-docker push registry.splunk.com/splunk/universalforwarder:7.0.1
+docker push registry.splunk.com/splunk/universalforwarder:7.0.2

From dcd8b9d548b1d3ec0d68721afcd0ade32160d850 Mon Sep 17 00:00:00 2001
From: Denis Gladkikh <denis@gladkikh.email>
Date: Tue, 24 Apr 2018 22:46:30 -0700
Subject: [PATCH 11/15] Splunk 7.1.0

---
 CONTRIBUTING.md                       |  2 +-
 enterprise/Dockerfile                 |  5 +++--
 enterprise/README.md                  | 18 +++++++++---------
 enterprise/build.sh                   |  8 ++++----
 enterprise/docker-compose.yml         |  6 +++---
 enterprise/entrypoint.sh              |  4 ++--
 enterprise/publishImage.sh            |  4 ++--
 universalforwarder/Dockerfile         |  4 ++--
 universalforwarder/README.md          | 14 +++++++-------
 universalforwarder/build.sh           |  8 ++++----
 universalforwarder/docker-compose.yml |  8 ++++----
 universalforwarder/entrypoint.sh      |  2 +-
 universalforwarder/publishImage.sh    |  4 ++--
 13 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5c9a034..23693ed 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ If you experience problems or see unexpected behavior with this project, create
 
 0. Version of this project you're using (ex: 1.5.0)
 0. Platform version (ex: Windows Server 2012 R2)
-0. Splunk version (ex: 7.0.2)
+0. Splunk version (ex: 7.1.0)
 0. Other relevant information (ex: local/remote environment, Splunk network configuration)
 
 Alternatively, if you have a Splunk question please ask on [Splunk Answers][answers].
diff --git a/enterprise/Dockerfile b/enterprise/Dockerfile
index 78aa03b..b4f9cd7 100644
--- a/enterprise/Dockerfile
+++ b/enterprise/Dockerfile
@@ -1,10 +1,11 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT splunk
-ENV SPLUNK_VERSION 7.0.2
-ENV SPLUNK_BUILD 03bbabbd5c0f
+ENV SPLUNK_VERSION 7.1.0
+ENV SPLUNK_BUILD 2e75b3406c5b
 ENV SPLUNK_FILENAME splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
+
 ENV SPLUNK_HOME /opt/splunk
 ENV SPLUNK_GROUP splunk
 ENV SPLUNK_USER splunk
diff --git a/enterprise/README.md b/enterprise/README.md
index 27f4620..2684b8d 100644
--- a/enterprise/README.md
+++ b/enterprise/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `7.0.2`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `7.1.0`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk Enterprise with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/enterprise/Dockerfile)
 
 # What is Splunk Enterprise?
@@ -16,7 +16,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 7.0.2 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 7.1.0 image.<br>
    
    ```bash
    docker pull splunk/splunk
@@ -35,10 +35,10 @@ See [How to use the Splunk Enterprise Docker image](#How-to-use-the-Splunk-Enter
 The following commands can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 
-### Pull an image for version 7.0.2 of Splunk Enterprise from this repository
+### Pull an image for version 7.1.0 of Splunk Enterprise from this repository
 
 ```bash
-docker pull splunk/splunk:7.0.2
+docker pull splunk/splunk:7.1.0
 ```
 
 ### Pull an image that uses the latest version of Splunk Enterprise from this repository
@@ -52,13 +52,13 @@ docker pull splunk/splunk:latest
 This command starts a Splunk Enterprise instance from the Docker container in this repository, accepts the license agreement, and opens TCP port 8000 so that you can access the Splunk instance from your local machine.
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.0.2
+docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.1.0
 ```
 ### Start a Splunk Enterprise container and mount the necessary container volumes
 
 ```bash
 docker run --name vsplunk -v /opt/splunk/etc -v /opt/splunk/var busybox
-docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.0.2
+docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.1.0
 ```
 
 > Note:
@@ -70,7 +70,7 @@ docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -
 ### Start a Splunk Enterprise container and mount volumes from host
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:7.0.2
+docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:7.1.0
 ```
 
 ### Use entrypoint.sh to execute Splunk commands
@@ -102,7 +102,7 @@ services:
   splunkenterprise:
 
     hostname: splunkenterprise
-    image: splunk/splunk:7.0.2
+    image: splunk/splunk:7.1.0
     environment:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997
@@ -129,7 +129,7 @@ services:
 
 The `splunk/splunk` image comes in several variants:
 
-`splunk/splunk:7.0.2`
+`splunk/splunk:7.1.0`
 This is the default Splunk Enterprise image.
 
 `splunk/splunk:6.5.3-monitor`
diff --git a/enterprise/build.sh b/enterprise/build.sh
index aa98bb2..3f0fcfc 100755
--- a/enterprise/build.sh
+++ b/enterprise/build.sh
@@ -3,7 +3,7 @@ if [ -z $CURRENT ]; then
 	CURRENT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 fi
 
-docker build --no-cache=true -t splunk/splunk:7.0.2 .
-docker tag splunk/splunk:7.0.2 splunk/splunk:latest 
-docker tag splunk/splunk:7.0.2 registry.splunk.com/splunk/splunk:latest 
-docker tag splunk/splunk:7.0.2 registry.splunk.com/splunk/splunk:7.0.2 
+docker build --no-cache=true -t splunk/splunk:7.1.0 .
+docker tag splunk/splunk:7.1.0 splunk/splunk:latest 
+docker tag splunk/splunk:7.1.0 registry.splunk.com/splunk/splunk:latest 
+docker tag splunk/splunk:7.1.0 registry.splunk.com/splunk/splunk:7.1.0 
diff --git a/enterprise/docker-compose.yml b/enterprise/docker-compose.yml
index 6a23b07..718686d 100644
--- a/enterprise/docker-compose.yml
+++ b/enterprise/docker-compose.yml
@@ -1,7 +1,7 @@
 # must accept EULA the first time that the image is started
-# docker run splunk/enterprise:7.0.2
+# docker run splunk/enterprise:7.1.0
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/enterprisetrial:7.0.2
+# 1. docker run -it splunk/enterprisetrial:7.1.0
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
 # e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/enterprisetrial 
 
@@ -16,7 +16,7 @@ services:
   splunkenterprise:
     #build: .
     hostname: splunkenterprise
-    image: splunk/splunk:7.0.2
+    image: splunk/splunk:7.1.0
     environment:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997
diff --git a/enterprise/entrypoint.sh b/enterprise/entrypoint.sh
index 38f7ca1..0f456ca 100644
--- a/enterprise/entrypoint.sh
+++ b/enterprise/entrypoint.sh
@@ -51,8 +51,8 @@ Splunk Enterprise
 
   Usage:
 
-    docker run -it splunk/enterprise:7.0.2
-    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:7.0.2
+    docker run -it splunk/enterprise:7.1.0
+    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:7.1.0
 
 EOF
     exit 1
diff --git a/enterprise/publishImage.sh b/enterprise/publishImage.sh
index 8c01ad2..3a77ccb 100755
--- a/enterprise/publishImage.sh
+++ b/enterprise/publishImage.sh
@@ -1,7 +1,7 @@
 
-docker push splunk/splunk:7.0.2
+docker push splunk/splunk:7.1.0
 docker push splunk/splunk:latest
-docker push registry.splunk.com/splunk/splunk:7.0.2
+docker push registry.splunk.com/splunk/splunk:7.1.0
 docker push registry.splunk.com/splunk/splunk:latest
 
 
diff --git a/universalforwarder/Dockerfile b/universalforwarder/Dockerfile
index 2e3deb3..76e90da 100644
--- a/universalforwarder/Dockerfile
+++ b/universalforwarder/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT universalforwarder
-ENV SPLUNK_VERSION 7.0.2
-ENV SPLUNK_BUILD 03bbabbd5c0f
+ENV SPLUNK_VERSION 7.1.0
+ENV SPLUNK_BUILD 2e75b3406c5b
 ENV SPLUNK_FILENAME splunkforwarder-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk
diff --git a/universalforwarder/README.md b/universalforwarder/README.md
index 6f82feb..1618eb9 100644
--- a/universalforwarder/README.md
+++ b/universalforwarder/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `7.0.2`, `latest` - Splunk universal forwarder base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `7.1.0`, `latest` - Splunk universal forwarder base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk universal forwarder with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/universalforwarder/Dockerfile)
 
 # What is the Splunk Universal Forwarder?
@@ -18,7 +18,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 7.0.2 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 7.1.0 image.<br>
 
    
    ```bash
@@ -49,14 +49,14 @@ The universal forwarder docker image can collect data from a host and send data
 The following commands are examples of how to pull and run the universal forwarder Docker image. They can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 ### Pull an image from this repository for the universal fowarder with the Docker data collection inputs
-The `7.0.2-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
+The `7.1.0-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
 
 ```bash
-docker pull splunk/universalforwarder:7.0.2-monitor
+docker pull splunk/universalforwarder:7.1.0-monitor
 ```
 
 ### Pull the latest version of the image from this repository
-The `7.0.2` and `latest` versions only have the forwarder and do not have any of the data inputs.
+The `7.1.0` and `latest` versions only have the forwarder and do not have any of the data inputs.
 =======
 The `6.5.3-monitor` tag ensures that the universal forwarder has the data inputs you need to get stats from a Docker container.
 
@@ -112,7 +112,7 @@ services:
   splunkuniversalforwarder:
 
     hostname: splunkuniversalforwarder
-    image: splunk/universalforwarder:7.0.2
+    image: splunk/universalforwarder:7.1.0
     environment: SPLUNK_START_ARGS: --accept-license
     volumes:
       - opt-splunk-etc:/opt/splunk/etc
@@ -135,7 +135,7 @@ services:
 
 The `splunk/universalforwarder` image comes in the following variants:
 
-`splunk/universalforwarder:7.0.2` and `splunk/universalforwarder:latest`
+`splunk/universalforwarder:7.1.0` and `splunk/universalforwarder:latest`
 This is the default universal forwarder image.
 
 `splunk/universalforwarder:6.5.3-monitor`
diff --git a/universalforwarder/build.sh b/universalforwarder/build.sh
index ef639b9..f31d57f 100755
--- a/universalforwarder/build.sh
+++ b/universalforwarder/build.sh
@@ -4,9 +4,9 @@ if [ -z $CURRENT ]; then
 fi
 
 
-docker build --no-cache=true -t splunk/universalforwarder:7.0.2 $CURRENT
-docker tag splunk/universalforwarder:7.0.2 splunk/universalforwarder:latest
-docker tag splunk/universalforwarder:7.0.2 registry.splunk.com/splunk/universalforwarder:7.0.2
-docker tag splunk/universalforwarder:7.0.2 registry.splunk.com/splunk/universalforwarder:latest
+docker build --no-cache=true -t splunk/universalforwarder:7.1.0 $CURRENT
+docker tag splunk/universalforwarder:7.1.0 splunk/universalforwarder:latest
+docker tag splunk/universalforwarder:7.1.0 registry.splunk.com/splunk/universalforwarder:7.1.0
+docker tag splunk/universalforwarder:7.1.0 registry.splunk.com/splunk/universalforwarder:latest
 
 
diff --git a/universalforwarder/docker-compose.yml b/universalforwarder/docker-compose.yml
index 54ad456..9034c8c 100644
--- a/universalforwarder/docker-compose.yml
+++ b/universalforwarder/docker-compose.yml
@@ -1,10 +1,10 @@
 # must accept EULA the first time that the image is started
 
-# docker run splunk/universalforwarder:7.0.2
+# docker run splunk/universalforwarder:7.1.0
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/universalforwarder:7.0.2
+# 1. docker run -it splunk/universalforwarder:7.1.0
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
-# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:7.0.2 
+# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:7.1.0 
 
 # Support for Docker Compose v3, https://docs.docker.com/compose/overview/
 version: '3'
@@ -17,7 +17,7 @@ services:
   splunkuniversalforwarder:
 #    build: .
     hostname: splunkuniversalforwarder
-    image: splunk/universalforwarder:7.0.2
+    image: splunk/universalforwarder:7.1.0
 #    environment:
 #      SPLUNK_START_ARGS: --accept-license
     volumes:
diff --git a/universalforwarder/entrypoint.sh b/universalforwarder/entrypoint.sh
index 30fd7c8..a99a8f0 100644
--- a/universalforwarder/entrypoint.sh
+++ b/universalforwarder/entrypoint.sh
@@ -51,7 +51,7 @@ Splunk Forwarder
 
   Usage:
 
-    docker run -it splunk/universalforwarder:7.0.2
+    docker run -it splunk/universalforwarder:7.1.0
     docker run --env SPLUNK_START_ARGS="--accept-license" outcoldman/splunk:latest-forwarder
 
 EOF
diff --git a/universalforwarder/publishImage.sh b/universalforwarder/publishImage.sh
index 14768ce..f3b0cc8 100755
--- a/universalforwarder/publishImage.sh
+++ b/universalforwarder/publishImage.sh
@@ -1,5 +1,5 @@
 #https://docs.docker.com/mac/step_six/
-docker push splunk/universalforwarder:7.0.2
+docker push splunk/universalforwarder:7.1.0
 docker push splunk/universalforwarder:latest
 docker push registry.splunk.com/splunk/universalforwarder:latest
-docker push registry.splunk.com/splunk/universalforwarder:7.0.2
+docker push registry.splunk.com/splunk/universalforwarder:7.1.0

From fa1eabb6a068b046cf3557e6570c576a501d235e Mon Sep 17 00:00:00 2001
From: Denis Gladkikh <denis@gladkikh.email>
Date: Wed, 25 Apr 2018 11:27:17 -0700
Subject: [PATCH 12/15] Add gen-and-print-passwd in examples

---
 enterprise/README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/enterprise/README.md b/enterprise/README.md
index 2684b8d..1d25f1f 100644
--- a/enterprise/README.md
+++ b/enterprise/README.md
@@ -24,8 +24,9 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. Run the Docker image.
    
    ```bash
-   docker run -d -e "SPLUNK_START_ARGS=--accept-license" -e "SPLUNK_USER=root" -p "8000:8000" splunk/splunk
+   docker run -d -e "SPLUNK_START_ARGS=--accept-license --gen-and-print-passwd" -e "SPLUNK_USER=root" -p "8000:8000" splunk/splunk
    ```
+0. Find randomly generated admin password in docker logs for this container.
 0. Access the Splunk instance with a browser by using the Docker machine IP address and Splunk Web port. For example, ``http://localhost:8000`
 
 See [How to use the Splunk Enterprise Docker image](#How-to-use-the-Splunk-Enterprise-Docker-image) for additional example commands.
@@ -52,13 +53,13 @@ docker pull splunk/splunk:latest
 This command starts a Splunk Enterprise instance from the Docker container in this repository, accepts the license agreement, and opens TCP port 8000 so that you can access the Splunk instance from your local machine.
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.1.0
+docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license --gen-and-print-passwd" splunk/splunk:7.1.0
 ```
 ### Start a Splunk Enterprise container and mount the necessary container volumes
 
 ```bash
 docker run --name vsplunk -v /opt/splunk/etc -v /opt/splunk/var busybox
-docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:7.1.0
+docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license --gen-and-print-passwd" splunk/splunk:7.1.0
 ```
 
 > Note:
@@ -70,7 +71,7 @@ docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -
 ### Start a Splunk Enterprise container and mount volumes from host
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:7.1.0
+docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license --gen-and-print-passwd" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:7.1.0
 ```
 
 ### Use entrypoint.sh to execute Splunk commands
@@ -104,7 +105,7 @@ services:
     hostname: splunkenterprise
     image: splunk/splunk:7.1.0
     environment:
-      SPLUNK_START_ARGS: --accept-license
+      SPLUNK_START_ARGS: --accept-license --gen-and-print-passwd
       SPLUNK_ENABLE_LISTEN: 9997
       SPLUNK_ADD: tcp 1514
     volumes:

From c462496a67b41d654810aa698141735c4ba2933b Mon Sep 17 00:00:00 2001
From: Renaud Holcombe <renaud.holcombe@hyperg0at.com>
Date: Sun, 27 May 2018 17:51:08 -0400
Subject: [PATCH 13/15] Updating to version 7.1.1.

---
 enterprise/Dockerfile         |  4 ++--
 enterprise/README.md          | 18 +++++++++---------
 enterprise/build.sh           |  8 ++++----
 enterprise/docker-compose.yml |  6 +++---
 enterprise/entrypoint.sh      |  4 ++--
 enterprise/publishImage.sh    |  4 ++--
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/enterprise/Dockerfile b/enterprise/Dockerfile
index b4f9cd7..52a3c68 100644
--- a/enterprise/Dockerfile
+++ b/enterprise/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT splunk
-ENV SPLUNK_VERSION 7.1.0
-ENV SPLUNK_BUILD 2e75b3406c5b
+ENV SPLUNK_VERSION 7.1.1
+ENV SPLUNK_BUILD 8f0ead9ec3db
 ENV SPLUNK_FILENAME splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 
diff --git a/enterprise/README.md b/enterprise/README.md
index 1d25f1f..210e0a7 100644
--- a/enterprise/README.md
+++ b/enterprise/README.md
@@ -1,6 +1,6 @@
 # Supported tags
 
-* `7.1.0`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
+* `7.1.1`,`latest`- Splunk Enterprise base image [Dockerfile](https://github.com/splunk/docker-splunk/blob/master/enterprise/Dockerfile)
 * `6.5.3-monitor` - Splunk Enterprise with Docker Monitoring [Dockerfile](https://github.com/splunk/docker-itmonitoring/blob/master/enterprise/Dockerfile)
 
 # What is Splunk Enterprise?
@@ -16,7 +16,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 0. (Optional) Sign up for a Docker ID at [Docker Hub](https://hub.docker.com).
 0. Download and install Docker on your system.
 0. Open a shell prompt or Terminal window.
-0. Enter the following command to pull the Splunk Enterprise version 7.1.0 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 7.1.1 image.<br>
    
    ```bash
    docker pull splunk/splunk
@@ -36,10 +36,10 @@ See [How to use the Splunk Enterprise Docker image](#How-to-use-the-Splunk-Enter
 The following commands can be run from a shell prompt or Docker QuickStart Terminal (on Mac OS X).
 
 
-### Pull an image for version 7.1.0 of Splunk Enterprise from this repository
+### Pull an image for version 7.1.1 of Splunk Enterprise from this repository
 
 ```bash
-docker pull splunk/splunk:7.1.0
+docker pull splunk/splunk:7.1.1
 ```
 
 ### Pull an image that uses the latest version of Splunk Enterprise from this repository
@@ -53,13 +53,13 @@ docker pull splunk/splunk:latest
 This command starts a Splunk Enterprise instance from the Docker container in this repository, accepts the license agreement, and opens TCP port 8000 so that you can access the Splunk instance from your local machine.
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license --gen-and-print-passwd" splunk/splunk:7.1.0
+docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license --gen-and-print-passwd" splunk/splunk:7.1.1
 ```
 ### Start a Splunk Enterprise container and mount the necessary container volumes
 
 ```bash
 docker run --name vsplunk -v /opt/splunk/etc -v /opt/splunk/var busybox
-docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license --gen-and-print-passwd" splunk/splunk:7.1.0
+docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license --gen-and-print-passwd" splunk/splunk:7.1.1
 ```
 
 > Note:
@@ -71,7 +71,7 @@ docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -
 ### Start a Splunk Enterprise container and mount volumes from host
 
 ```bash
-docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license --gen-and-print-passwd" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:7.1.0
+docker run --name splunk --hostname splunk -p 8000:8000  -e "SPLUNK_START_ARGS=--accept-license --gen-and-print-passwd" -v /opt/splunk/etc:/opt/splunk/etc -v /opt/splunk/var:/opt/splunk/var  splunk/splunk:7.1.1
 ```
 
 ### Use entrypoint.sh to execute Splunk commands
@@ -103,7 +103,7 @@ services:
   splunkenterprise:
 
     hostname: splunkenterprise
-    image: splunk/splunk:7.1.0
+    image: splunk/splunk:7.1.1
     environment:
       SPLUNK_START_ARGS: --accept-license --gen-and-print-passwd
       SPLUNK_ENABLE_LISTEN: 9997
@@ -130,7 +130,7 @@ services:
 
 The `splunk/splunk` image comes in several variants:
 
-`splunk/splunk:7.1.0`
+`splunk/splunk:7.1.1`
 This is the default Splunk Enterprise image.
 
 `splunk/splunk:6.5.3-monitor`
diff --git a/enterprise/build.sh b/enterprise/build.sh
index 3f0fcfc..8619d5b 100755
--- a/enterprise/build.sh
+++ b/enterprise/build.sh
@@ -3,7 +3,7 @@ if [ -z $CURRENT ]; then
 	CURRENT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 fi
 
-docker build --no-cache=true -t splunk/splunk:7.1.0 .
-docker tag splunk/splunk:7.1.0 splunk/splunk:latest 
-docker tag splunk/splunk:7.1.0 registry.splunk.com/splunk/splunk:latest 
-docker tag splunk/splunk:7.1.0 registry.splunk.com/splunk/splunk:7.1.0 
+docker build --no-cache=true -t splunk/splunk:7.1.1 .
+docker tag splunk/splunk:7.1.1 splunk/splunk:latest 
+docker tag splunk/splunk:7.1.1 registry.splunk.com/splunk/splunk:latest 
+docker tag splunk/splunk:7.1.1 registry.splunk.com/splunk/splunk:7.1.1 
diff --git a/enterprise/docker-compose.yml b/enterprise/docker-compose.yml
index 718686d..eebc59a 100644
--- a/enterprise/docker-compose.yml
+++ b/enterprise/docker-compose.yml
@@ -1,7 +1,7 @@
 # must accept EULA the first time that the image is started
-# docker run splunk/enterprise:7.1.0
+# docker run splunk/enterprise:7.1.1
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/enterprisetrial:7.1.0
+# 1. docker run -it splunk/enterprisetrial:7.1.1
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
 # e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/enterprisetrial 
 
@@ -16,7 +16,7 @@ services:
   splunkenterprise:
     #build: .
     hostname: splunkenterprise
-    image: splunk/splunk:7.1.0
+    image: splunk/splunk:7.1.1
     environment:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997
diff --git a/enterprise/entrypoint.sh b/enterprise/entrypoint.sh
index 0f456ca..6ea957e 100644
--- a/enterprise/entrypoint.sh
+++ b/enterprise/entrypoint.sh
@@ -51,8 +51,8 @@ Splunk Enterprise
 
   Usage:
 
-    docker run -it splunk/enterprise:7.1.0
-    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:7.1.0
+    docker run -it splunk/enterprise:7.1.1
+    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:7.1.1
 
 EOF
     exit 1
diff --git a/enterprise/publishImage.sh b/enterprise/publishImage.sh
index 3a77ccb..431c341 100755
--- a/enterprise/publishImage.sh
+++ b/enterprise/publishImage.sh
@@ -1,7 +1,7 @@
 
-docker push splunk/splunk:7.1.0
+docker push splunk/splunk:7.1.1
 docker push splunk/splunk:latest
-docker push registry.splunk.com/splunk/splunk:7.1.0
+docker push registry.splunk.com/splunk/splunk:7.1.1
 docker push registry.splunk.com/splunk/splunk:latest
 
 

From 682131b9804c292149f2422c70a11c6e964c3dd2 Mon Sep 17 00:00:00 2001
From: Renaud Holcombe <renaud.holcombe@hyperg0at.com>
Date: Sun, 27 May 2018 17:56:20 -0400
Subject: [PATCH 14/15] Update contribution file for 7.1.1.

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 23693ed..6784d9f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ If you experience problems or see unexpected behavior with this project, create
 
 0. Version of this project you're using (ex: 1.5.0)
 0. Platform version (ex: Windows Server 2012 R2)
-0. Splunk version (ex: 7.1.0)
+0. Splunk version (ex: 7.1.1)
 0. Other relevant information (ex: local/remote environment, Splunk network configuration)
 
 Alternatively, if you have a Splunk question please ask on [Splunk Answers][answers].

From 7ebe2c3c0730dd4ca9fa3b2118a1f730562fe639 Mon Sep 17 00:00:00 2001
From: Renaud Holcombe <renaud.holcombe@hyperg0at.com>
Date: Sun, 27 May 2018 18:01:52 -0400
Subject: [PATCH 15/15] Add entries for universal forwarder.

---
 universalforwarder/Dockerfile         | 4 ++--
 universalforwarder/build.sh           | 8 ++++----
 universalforwarder/docker-compose.yml | 8 ++++----
 universalforwarder/entrypoint.sh      | 2 +-
 universalforwarder/publishImage.sh    | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/universalforwarder/Dockerfile b/universalforwarder/Dockerfile
index 76e90da..e9d08e5 100644
--- a/universalforwarder/Dockerfile
+++ b/universalforwarder/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:jessie
 
 ENV SPLUNK_PRODUCT universalforwarder
-ENV SPLUNK_VERSION 7.1.0
-ENV SPLUNK_BUILD 2e75b3406c5b
+ENV SPLUNK_VERSION 7.1.1
+ENV SPLUNK_BUILD 8f0ead9ec3db
 ENV SPLUNK_FILENAME splunkforwarder-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk
diff --git a/universalforwarder/build.sh b/universalforwarder/build.sh
index f31d57f..08b608b 100755
--- a/universalforwarder/build.sh
+++ b/universalforwarder/build.sh
@@ -4,9 +4,9 @@ if [ -z $CURRENT ]; then
 fi
 
 
-docker build --no-cache=true -t splunk/universalforwarder:7.1.0 $CURRENT
-docker tag splunk/universalforwarder:7.1.0 splunk/universalforwarder:latest
-docker tag splunk/universalforwarder:7.1.0 registry.splunk.com/splunk/universalforwarder:7.1.0
-docker tag splunk/universalforwarder:7.1.0 registry.splunk.com/splunk/universalforwarder:latest
+docker build --no-cache=true -t splunk/universalforwarder:7.1.1 $CURRENT
+docker tag splunk/universalforwarder:7.1.1 splunk/universalforwarder:latest
+docker tag splunk/universalforwarder:7.1.1 registry.splunk.com/splunk/universalforwarder:7.1.1
+docker tag splunk/universalforwarder:7.1.1 registry.splunk.com/splunk/universalforwarder:latest
 
 
diff --git a/universalforwarder/docker-compose.yml b/universalforwarder/docker-compose.yml
index 9034c8c..8a9a46b 100644
--- a/universalforwarder/docker-compose.yml
+++ b/universalforwarder/docker-compose.yml
@@ -1,10 +1,10 @@
 # must accept EULA the first time that the image is started
 
-# docker run splunk/universalforwarder:7.1.0
+# docker run splunk/universalforwarder:7.1.1
 # Options on how to review the EULA and accept it: 
-# 1. docker run -it splunk/universalforwarder:7.1.0
+# 1. docker run -it splunk/universalforwarder:7.1.1
 # 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
-# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:7.1.0 
+# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:7.1.1 
 
 # Support for Docker Compose v3, https://docs.docker.com/compose/overview/
 version: '3'
@@ -17,7 +17,7 @@ services:
   splunkuniversalforwarder:
 #    build: .
     hostname: splunkuniversalforwarder
-    image: splunk/universalforwarder:7.1.0
+    image: splunk/universalforwarder:7.1.1
 #    environment:
 #      SPLUNK_START_ARGS: --accept-license
     volumes:
diff --git a/universalforwarder/entrypoint.sh b/universalforwarder/entrypoint.sh
index a99a8f0..0e06b64 100644
--- a/universalforwarder/entrypoint.sh
+++ b/universalforwarder/entrypoint.sh
@@ -51,7 +51,7 @@ Splunk Forwarder
 
   Usage:
 
-    docker run -it splunk/universalforwarder:7.1.0
+    docker run -it splunk/universalforwarder:7.1.1
     docker run --env SPLUNK_START_ARGS="--accept-license" outcoldman/splunk:latest-forwarder
 
 EOF
diff --git a/universalforwarder/publishImage.sh b/universalforwarder/publishImage.sh
index f3b0cc8..312c3c3 100755
--- a/universalforwarder/publishImage.sh
+++ b/universalforwarder/publishImage.sh
@@ -1,5 +1,5 @@
 #https://docs.docker.com/mac/step_six/
-docker push splunk/universalforwarder:7.1.0
+docker push splunk/universalforwarder:7.1.1
 docker push splunk/universalforwarder:latest
 docker push registry.splunk.com/splunk/universalforwarder:latest
-docker push registry.splunk.com/splunk/universalforwarder:7.1.0
+docker push registry.splunk.com/splunk/universalforwarder:7.1.1