Skip to content

Commit

Permalink
Merge branch 'papebadiane-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
spujadas committed May 17, 2018
2 parents 9bab4cf + bf1d868 commit 6e71b0e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Dockerfile for ELK stack
# Elasticsearch, Logstash, Kibana 6.2.3
# Elasticsearch, Logstash, Kibana 6.2.4

# Build with:
# docker build -t <repo-user>/elk .
Expand Down Expand Up @@ -39,7 +39,7 @@ RUN set -x \
&& set +x


ENV ELK_VERSION 6.2.3
ENV ELK_VERSION 6.2.4

### install Elasticsearch

Expand Down
2 changes: 1 addition & 1 deletion README-short.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Collect, search and visualise log data with ELK (Elasticsearch 6.2.3, Logstash 6.2.3, Kibana 6.2.3).
Collect, search and visualise log data with ELK (Elasticsearch 6.2.4, Logstash 6.2.4, Kibana 6.2.4).
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ This image is hosted on Docker Hub at [https://hub.docker.com/r/sebp/elk/](https

The following tags are available:

- `latest`, `623`: ELK 6.2.3.
- `latest`, `624`: ELK 6.2.4.

- `623`: ELK 6.2.3.

- `622`: ELK 6.2.2.

Expand Down Expand Up @@ -99,7 +101,7 @@ The following tags are available:
- `es232_l232_k450`: Elasticsearch 2.3.2, Logstash 2.3.2, and Kibana 4.5.0.

- `es231_l231_k450`: Elasticsearch 2.3.1, Logstash 2.3.1, and Kibana 4.5.0.

- `es230_l230_k450`: Elasticsearch 2.3.0, Logstash 2.3.0, and Kibana 4.5.0.

- `es221_l222_k442`: Elasticsearch 2.2.1, Logstash 2.2.2, and Kibana 4.4.2.
Expand All @@ -115,4 +117,3 @@ The following tags are available:
### About

Written by [Sébastien Pujadas](https://pujadas.net), released under the [Apache 2 license](https://www.apache.org/licenses/LICENSE-2.0).

4 changes: 2 additions & 2 deletions nginx-filebeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Dockerfile to illustrate how Filebeat can be used with nginx
# Filebeat 6.2.3
# Filebeat 6.2.4

# Build with:
# docker build -t filebeat-nginx-example .
Expand All @@ -19,7 +19,7 @@ ENV REFRESHED_AT 2016-11-04

### install Filebeat

ENV FILEBEAT_VERSION 6.2.3
ENV FILEBEAT_VERSION 6.2.4


RUN apt-get update -qq \
Expand Down
2 changes: 1 addition & 1 deletion spec/Dockerfile_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "docker"
require "serverspec"

ELK_VERSION = "6.2.3"
ELK_VERSION = "6.2.4"
ELASTICSEARCH_VERSION = ELK_VERSION
LOGSTASH_VERSION = ELK_VERSION
KIBANA_VERSION = ELK_VERSION
Expand Down

0 comments on commit 6e71b0e

Please sign in to comment.