diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 23693ed..48edb76 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.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 b4f9cd7..7549d96 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.2 +ENV SPLUNK_BUILD a0c72a66db66 ENV SPLUNK_FILENAME splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz diff --git a/enterprise/README.md b/enterprise/README.md index 1d25f1f..72c3622 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.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.1.0 image.
+0. Enter the following command to pull the Splunk Enterprise version 7.1.2 image.
```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.2 of Splunk Enterprise from this repository ```bash -docker pull splunk/splunk:7.1.0 +docker pull splunk/splunk:7.1.2 ``` ### 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.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 --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.2 ``` > 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.2 ``` ### 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.2 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.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 3f0fcfc..e5db56f 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.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 diff --git a/enterprise/docker-compose.yml b/enterprise/docker-compose.yml index 718686d..0f4b473 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.2 # 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.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.1.0 + image: splunk/splunk:7.1.2 environment: SPLUNK_START_ARGS: --accept-license SPLUNK_ENABLE_LISTEN: 9997 diff --git a/enterprise/entrypoint.sh b/enterprise/entrypoint.sh index 0f456ca..961566c 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.2 +    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:7.1.2 EOF exit 1 diff --git a/enterprise/publishImage.sh b/enterprise/publishImage.sh index 3a77ccb..4aac944 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.2 docker push splunk/splunk:latest -docker push registry.splunk.com/splunk/splunk:7.1.0 +docker push registry.splunk.com/splunk/splunk:7.1.2 docker push registry.splunk.com/splunk/splunk:latest diff --git a/universalforwarder/Dockerfile b/universalforwarder/Dockerfile index 76e90da..946d62a 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.2 +ENV SPLUNK_BUILD a0c72a66db66 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 1618eb9..475e5f6 100644 --- a/universalforwarder/README.md +++ b/universalforwarder/README.md @@ -1,6 +1,6 @@ # Supported tags -* `7.1.0`, `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.1.0 image.
+0. Enter the following command to pull the Splunk Enterprise version 7.1.2 image.
```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.1.0-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.1.0-monitor +docker pull splunk/universalforwarder:7.1.2-monitor ``` ### Pull the latest version of the image from this repository -The `7.1.0` 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. @@ -112,7 +112,7 @@ services: splunkuniversalforwarder: hostname: splunkuniversalforwarder - image: splunk/universalforwarder:7.1.0 + image: splunk/universalforwarder:7.1.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.1.0` 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` diff --git a/universalforwarder/build.sh b/universalforwarder/build.sh index f31d57f..823b12a 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.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 diff --git a/universalforwarder/docker-compose.yml b/universalforwarder/docker-compose.yml index 9034c8c..91b47fd 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.2 # 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.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.1.0 +# 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.1.0 + image: splunk/universalforwarder:7.1.2 # environment: # SPLUNK_START_ARGS: --accept-license volumes: diff --git a/universalforwarder/entrypoint.sh b/universalforwarder/entrypoint.sh index a99a8f0..22eeac8 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.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 f3b0cc8..1b24fca 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.2 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.2