Skip to content

Commit

Permalink
Merge pull request #69 from efcasado/7.0.3
Browse files Browse the repository at this point in the history
Splunk 7.0.3
  • Loading branch information
michaelwilde authored May 5, 2018
2 parents 72a601d + e8f993e commit ac794a8
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 42 deletions.
4 changes: 2 additions & 2 deletions enterprise/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM debian:jessie

ENV SPLUNK_PRODUCT splunk
ENV SPLUNK_VERSION 7.0.2
ENV SPLUNK_BUILD 03bbabbd5c0f
ENV SPLUNK_VERSION 7.0.3
ENV SPLUNK_BUILD fa31da744b51
ENV SPLUNK_FILENAME splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz

ENV SPLUNK_HOME /opt/splunk
Expand Down
18 changes: 9 additions & 9 deletions enterprise/README.md
Original file line number Diff line number Diff line change
@@ -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.0.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?
Expand All @@ -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.0.3 image.<br>

```bash
docker pull splunk/splunk
Expand All @@ -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.0.3 of Splunk Enterprise from this repository

```bash
docker pull splunk/splunk:7.0.2
docker pull splunk/splunk:7.0.3
```

### Pull an image that uses the latest version of Splunk Enterprise from this repository
Expand All @@ -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.0.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: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.0.3
```

> Note:
Expand All @@ -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.0.3
```

### Use entrypoint.sh to execute Splunk commands
Expand Down Expand Up @@ -102,7 +102,7 @@ services:
splunkenterprise:
hostname: splunkenterprise
image: splunk/splunk:7.0.2
image: splunk/splunk:7.0.3
environment:
SPLUNK_START_ARGS: --accept-license
SPLUNK_ENABLE_LISTEN: 9997
Expand All @@ -129,7 +129,7 @@ services:

The `splunk/splunk` image comes in several variants:

`splunk/splunk:7.0.2`
`splunk/splunk:7.0.3`
This is the default Splunk Enterprise image.

`splunk/splunk:6.5.3-monitor`
Expand Down
8 changes: 4 additions & 4 deletions enterprise/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.3 .
docker tag splunk/splunk:7.0.3 splunk/splunk:latest
docker tag splunk/splunk:7.0.3 registry.splunk.com/splunk/splunk:latest
docker tag splunk/splunk:7.0.3 registry.splunk.com/splunk/splunk:7.0.3
6 changes: 3 additions & 3 deletions enterprise/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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.0.3
# 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.0.3
# 2. Add the following environment variable: SPLUNK_START_ARGS=--accept-license
# e.g., docker run -e "SPLUNK_START_ARGS=--accept-license" splunk/enterprisetrial

Expand All @@ -16,7 +16,7 @@ services:
splunkenterprise:
#build: .
hostname: splunkenterprise
image: splunk/splunk:7.0.2
image: splunk/splunk:7.0.3
environment:
SPLUNK_START_ARGS: --accept-license
SPLUNK_ENABLE_LISTEN: 9997
Expand Down
4 changes: 2 additions & 2 deletions enterprise/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.3
    docker run --env SPLUNK_START_ARGS="--accept-license" splunk/enterprise:7.0.3
EOF
exit 1
Expand Down
4 changes: 2 additions & 2 deletions enterprise/publishImage.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

docker push splunk/splunk:7.0.2
docker push splunk/splunk:7.0.3
docker push splunk/splunk:latest
docker push registry.splunk.com/splunk/splunk:7.0.2
docker push registry.splunk.com/splunk/splunk:7.0.3
docker push registry.splunk.com/splunk/splunk:latest


4 changes: 2 additions & 2 deletions universalforwarder/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.0.3
ENV SPLUNK_BUILD fa31da744b51
ENV SPLUNK_FILENAME splunkforwarder-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-x86_64.tgz

ENV SPLUNK_HOME /opt/splunk
Expand Down
14 changes: 7 additions & 7 deletions universalforwarder/README.md
Original file line number Diff line number Diff line change
@@ -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.0.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?
Expand All @@ -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.0.3 image.<br>


```bash
Expand Down Expand Up @@ -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.0.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:7.0.2-monitor
docker pull splunk/universalforwarder:7.0.3-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.0.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.

Expand Down Expand Up @@ -112,7 +112,7 @@ services:
splunkuniversalforwarder:
hostname: splunkuniversalforwarder
image: splunk/universalforwarder:7.0.2
image: splunk/universalforwarder:7.0.3
environment: SPLUNK_START_ARGS: --accept-license
volumes:
- opt-splunk-etc:/opt/splunk/etc
Expand All @@ -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.0.3` and `splunk/universalforwarder:latest`
This is the default universal forwarder image.

`splunk/universalforwarder:6.5.3-monitor`
Expand Down
8 changes: 4 additions & 4 deletions universalforwarder/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.3 $CURRENT
docker tag splunk/universalforwarder:7.0.3 splunk/universalforwarder:latest
docker tag splunk/universalforwarder:7.0.3 registry.splunk.com/splunk/universalforwarder:7.0.3
docker tag splunk/universalforwarder:7.0.3 registry.splunk.com/splunk/universalforwarder:latest


8 changes: 4 additions & 4 deletions universalforwarder/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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.0.3
# 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.0.3
# 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.0.3

# Support for Docker Compose v3, https://docs.docker.com/compose/overview/
version: '3'
Expand All @@ -17,7 +17,7 @@ services:
splunkuniversalforwarder:
# build: .
hostname: splunkuniversalforwarder
image: splunk/universalforwarder:7.0.2
image: splunk/universalforwarder:7.0.3
# environment:
# SPLUNK_START_ARGS: --accept-license
volumes:
Expand Down
2 changes: 1 addition & 1 deletion universalforwarder/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Splunk Forwarder
  Usage:
    docker run -it splunk/universalforwarder:7.0.2
    docker run -it splunk/universalforwarder:7.0.3
    docker run --env SPLUNK_START_ARGS="--accept-license" outcoldman/splunk:latest-forwarder
EOF
Expand Down
4 changes: 2 additions & 2 deletions universalforwarder/publishImage.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#https://docs.docker.com/mac/step_six/
docker push splunk/universalforwarder:7.0.2
docker push splunk/universalforwarder:7.0.3
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.0.3

0 comments on commit ac794a8

Please sign in to comment.