Merge branch 'amatellanes-update-elk-to-680' into v6

spujadas · Oct 14, 2019 · 6524b99 · 6524b99
2 parents c1c2643 + 49ab072
commit 6524b99
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Dockerfile for ELK stack
-# Elasticsearch, Logstash, Kibana 6.7.2
+# Elasticsearch, Logstash, Kibana 6.8.0
 
 # Build with:
 # docker build -t <repo-user>/elk .
@@ -41,7 +41,7 @@ RUN set -x \
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/jre
 
 
-ENV ELK_VERSION 6.7.2
+ENV ELK_VERSION 6.8.0
 
 ### install Elasticsearch
 

diff --git a/README-short.txt b/README-short.txt
@@ -1 +1 @@
-Collect, search and visualise log data with ELK (Elasticsearch 6.7.2, Logstash 6.7.2, Kibana 6.7.2).
+Collect, search and visualise log data with ELK (Elasticsearch 6.8.0, Logstash 6.8.0, Kibana 6.8.0).
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ This image is hosted on Docker Hub at [https://hub.docker.com/r/sebp/elk/](https
 
 The following tags are available up to version 6:
 
-- `672` (ELK 6.7.2), `671` (6.7.1), `670` (6.7.0), `662` (6.6.2), `661` (6.6.1), `660` (6.6.0), `651` (6.5.1), `650` (6.5.0), `643` (6.4.3), `642` (6.4.2), `641` (6.4.1), `640` (6.4.0), `632` (6.3.2), `631` (6.3.1), `630` (6.3.0), `624` (6.2.4), `623` (6.2.3), `622` (6.2.2), `621` (6.2.1), `620` (6.2.0), `613` (6.1.3), `612` (6.1.2), `611` (6.1.1), `610` (6.1.0), `601` (6.0.1), `600` (6.0.0).
+- `680` (ELK 6.8.0), `672` (6.7.2), `671` (6.7.1), `670` (6.7.0), `662` (6.6.2), `661` (6.6.1), `660` (6.6.0), `651` (6.5.1), `650` (6.5.0), `643` (6.4.3), `642` (6.4.2), `641` (6.4.1), `640` (6.4.0), `632` (6.3.2), `631` (6.3.1), `630` (6.3.0), `624` (6.2.4), `623` (6.2.3), `622` (6.2.2), `621` (6.2.1), `620` (6.2.0), `613` (6.1.3), `612` (6.1.2), `611` (6.1.1), `610` (6.1.0), `601` (6.0.1), `600` (6.0.0).
 
 - `5615` (ELK 5.6.15), `568` (5.6.8), - `568` (5.6.8), `564` (5.6.4), `563` (5.6.3), `562` (5.6.2), `561` (5.6.1), `560` (5.6.0), `553` (5.5.3), `552` (5.5.2), `551` (5.5.1), `550` (5.5.0), `543` (5.4.3), `542` (5.4.2), `541` (5.4.1), `540` (5.4.0), `532` (5.3.2), `531` (5.3.1), `530` (5.3.0), `522` (5.2.2), `521` (5.2.1), `520` (5.2.0), `512` (5.1.2), `511` (5.1.1), `502` (5.0.2).
 

diff --git a/nginx-filebeat/Dockerfile b/nginx-filebeat/Dockerfile
@@ -1,5 +1,5 @@
 # Dockerfile to illustrate how Filebeat can be used with nginx
-# Filebeat 6.7.2
+# Filebeat 6.8.0
 
 # Build with:
 # docker build -t filebeat-nginx-example .
@@ -19,7 +19,7 @@ ENV REFRESHED_AT 2016-11-04
 
 ### install Filebeat
 
-ENV FILEBEAT_VERSION 6.7.2
+ENV FILEBEAT_VERSION 6.8.0
 
 
 RUN apt-get update -qq \

diff --git a/spec/Dockerfile_spec.rb b/spec/Dockerfile_spec.rb
@@ -1,7 +1,7 @@
 require "docker"
 require "serverspec"
 
-ELK_VERSION = "6.7.2"
+ELK_VERSION = "6.8.0"
 ELASTICSEARCH_VERSION = ELK_VERSION
 LOGSTASH_VERSION = ELK_VERSION
 KIBANA_VERSION = ELK_VERSION
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Collect, search and visualise log data with ELK (Elasticsearch 6.7.2, Logstash 6.7.2, Kibana 6.7.2).
		Collect, search and visualise log data with ELK (Elasticsearch 6.8.0, Logstash 6.8.0, Kibana 6.8.0).