Merge branch 'yannouchou-patch-1'

spujadas · Feb 28, 2018 · dbc5f5c · dbc5f5c
2 parents a5debae + 1546c44
commit dbc5f5c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Dockerfile for ELK stack
-# Elasticsearch, Logstash, Kibana 6.2.1
+# Elasticsearch, Logstash, Kibana 6.2.2
 
 # Build with:
 # docker build -t <repo-user>/elk .
@@ -9,7 +9,7 @@
 
 FROM phusion/baseimage
 MAINTAINER Sebastien Pujadas http://pujadas.net
-ENV REFRESHED_AT 2017-01-13
+ENV REFRESHED_AT 2017-02-28
 
 
 ###############################################################################
@@ -39,7 +39,7 @@ RUN set -x \
  && set +x
 
 
-ENV ELK_VERSION 6.2.1
+ENV ELK_VERSION 6.2.2
 
 ### install Elasticsearch
 

diff --git a/README-short.txt b/README-short.txt
@@ -1 +1 @@
-Collect, search and visualise log data with ELK (Elasticsearch 6.2.1, Logstash 6.2.1, Kibana 6.2.1).
+Collect, search and visualise log data with ELK (Elasticsearch 6.2.2, Logstash 6.2.2, Kibana 6.2.2).
diff --git a/README.md b/README.md
@@ -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`, `621`: ELK 6.2.1.
+- `latest`, `622`: ELK 6.2.2.
+
+- `621`: ELK 6.2.1.
 
 - `620`: ELK 6.2.0.
 

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.2.1
+# Filebeat 6.2.2
 
 # Build with:
 # docker build -t filebeat-nginx-example .
@@ -19,7 +19,7 @@ ENV REFRESHED_AT 2016-11-04
 
 ### install Filebeat
 
-ENV FILEBEAT_VERSION 6.2.1
+ENV FILEBEAT_VERSION 6.2.2
 
 
 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.2.1"
+ELK_VERSION = "6.2.2"
 ELASTICSEARCH_VERSION = ELK_VERSION
 LOGSTASH_VERSION = ELK_VERSION
 KIBANA_VERSION = ELK_VERSION