Moving from 7.1.2 branch to master for release

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.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].

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.2
+ENV SPLUNK_BUILD a0c72a66db66
 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

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.2 .
+docker tag splunk/splunk:7.1.2 splunk/splunk:latest 
+docker tag splunk/splunk:7.1.2 registry.splunk.com/splunk/splunk:latest 
+docker tag splunk/splunk:7.1.2 registry.splunk.com/splunk/splunk:7.1.2 

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.2
 # 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.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.2
+    image: splunk/splunk:7.1.2
     environment:
       SPLUNK_START_ARGS: --accept-license
       SPLUNK_ENABLE_LISTEN: 9997

enterprise/entrypoint.sh

@@ -47,12 +47,12 @@ Splunk Enterprise
         end user license agreement
       - If you have reviewed and accepted the license, start container
         with the environment variable:
-            SPLUNK_START_ARGS=--accept-license
+            SPLUNK_START_ARGS=--accept-license --seed-passwd <your password>
 
   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.2
+    docker run --env SPLUNK_START_ARGS="--accept-license --seed-passwd <your password>" splunk/enterprise:7.1.2
 
 EOF
     exit 1

enterprise/publishImage.sh

@@ -1,7 +1,7 @@
 
-docker push splunk/splunk:7.0.2
+docker push splunk/splunk:7.1.2
 docker push splunk/splunk:latest
-docker push registry.splunk.com/splunk/splunk:7.0.2
+docker push registry.splunk.com/splunk/splunk:7.1.2
 docker push registry.splunk.com/splunk/splunk:latest
 
 

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.2
+ENV SPLUNK_BUILD a0c72a66db66
 ENV SPLUNK_FILENAME splunkforwarder-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz
 
 ENV SPLUNK_HOME /opt/splunk

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.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.2 image.<br>
+0. Enter the following command to pull the Splunk Enterprise version 7.1.2 image.<br>
 
 
    ```bash
@@ -28,7 +28,7 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
 
    ```bash
    docker run --name splunkuniversalforwarder \
-     --env SPLUNK_START_ARGS=--accept-license \
+     --env SPLUNK_START_ARGS="--accept-license --seed-passwd <your password>" \
        --env SPLUNK_FORWARD_SERVER=splunk_ip:9997 \
      --env SPLUNK_USER=root \
      --volume /var/lib/docker/containers:/host/containers:ro \
@@ -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.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.2-monitor
+docker pull splunk/universalforwarder:7.1.2-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.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.
 
@@ -74,13 +74,13 @@ docker pull splunk/universalforwarder:latest
 This command starts a universal forwarder 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 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/universalforwarder
+docker run --name splunk --hostname splunk -d -e "SPLUNK_START_ARGS=--accept-license --seed-passwd <your password>" splunk/universalforwarder
 ```
 ### Start a universal forwarder 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 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/universalforwarder
+docker run --hostname splunk --name splunk --volumes-from=vsplunk -d -e "SPLUNK_START_ARGS=--accept-license --seed-passwd <your password>" splunk/universalforwarder
 ```
 
 ### Use entrypoint.sh to execute Splunk commands
@@ -112,8 +112,8 @@ services:
   splunkuniversalforwarder:
 
     hostname: splunkuniversalforwarder
-    image: splunk/universalforwarder:7.0.2
-    environment: SPLUNK_START_ARGS: --accept-license
+    image: splunk/universalforwarder:7.1.2
+    environment: SPLUNK_START_ARGS: --accept-license --seed-passwd <your password>
     volumes:
       - opt-splunk-etc:/opt/splunk/etc
       - opt-splunk-var:/opt/splunk/var
@@ -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.2` and `splunk/universalforwarder:latest`
 This is the default universal forwarder image.
 
 `splunk/universalforwarder:6.5.3-monitor`
@@ -259,7 +259,7 @@ If you use `docker-compose` (or reference an existing volume with `docker run`)
 0. In the `Environment:` section for the universal forwarder image, add the following line:
 
    ```
-   SPLUNK_START_ARGS: --accept-license --answer-yes
+   SPLUNK_START_ARGS: --accept-license --seed-passwd <your password> --answer-yes
    ```
 0. Save `docker-compose.yml` and close it.
 0. Run `docker-compose up` again.

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.2 $CURRENT
+docker tag splunk/universalforwarder:7.1.2 splunk/universalforwarder:latest
+docker tag splunk/universalforwarder:7.1.2 registry.splunk.com/splunk/universalforwarder:7.1.2
+docker tag splunk/universalforwarder:7.1.2 registry.splunk.com/splunk/universalforwarder:latest
 
 

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.2
 # 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.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.2 
+# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/splunkuniversalforwarder:7.1.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.2
+    image: splunk/universalforwarder:7.1.2
 #    environment:
 #      SPLUNK_START_ARGS: --accept-license
     volumes:

universalforwarder/entrypoint.sh

@@ -47,12 +47,12 @@ Splunk Forwarder
         end user license agreement
       - If you have reviewed and accepted the license, start container
         with the environment variable:
-            SPLUNK_START_ARGS=--accept-license
+            SPLUNK_START_ARGS=--accept-license --seed-passwd <your password>
 
   Usage:
 
-    docker run -it splunk/universalforwarder:7.0.2
-    docker run --env SPLUNK_START_ARGS="--accept-license" outcoldman/splunk:latest-forwarder
+    docker run -it splunk/universalforwarder:7.1.2
+    docker run --env SPLUNK_START_ARGS="--accept-license --seed-passwd <your password>" splunk/universalforwarder:7.1.2
 
 EOF
     exit 1

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.2
 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.2