diff --git a/Dockerfile b/Dockerfile index 09c0eeed..c7991520 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile for ELK stack -# Elasticsearch, Logstash, Kibana 5.6.9 +# Elasticsearch, Logstash, Kibana 5.6.10 # Build with: # docker build -t /elk . @@ -39,7 +39,7 @@ RUN set -x \ && set +x -ENV ELK_VERSION 5.6.9 +ENV ELK_VERSION 5.6.10 ### install Elasticsearch diff --git a/README-short.txt b/README-short.txt index a8607480..bb956808 100644 --- a/README-short.txt +++ b/README-short.txt @@ -1 +1 @@ -Collect, search and visualise log data with ELK (Elasticsearch 5.6.9, Logstash 5.6.9, Kibana 5.6.9). +Collect, search and visualise log data with ELK (Elasticsearch 5.6.10, Logstash 5.6.10, Kibana 5.6.10). diff --git a/README.md b/README.md index a4957dbe..5ad64e41 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,11 @@ 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`, `630`: ELK 6.3.0. + +- `624`: ELK 6.2.4. + +- `623`: ELK 6.2.3. - `622`: ELK 6.2.2. @@ -34,6 +38,8 @@ The following tags are available: - `600`: ELK 6.0.0. +- `5610`: ELK 5.6.10. + - `569`: ELK 5.6.9. - `568`: ELK 5.6.8. @@ -101,7 +107,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. @@ -117,4 +123,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). - diff --git a/nginx-filebeat/Dockerfile b/nginx-filebeat/Dockerfile index 125f6909..089d32f7 100644 --- a/nginx-filebeat/Dockerfile +++ b/nginx-filebeat/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to illustrate how Filebeat can be used with nginx -# Filebeat 5.6.9 +# Filebeat 5.6.10 # Build with: # docker build -t filebeat-nginx-example . @@ -19,7 +19,7 @@ ENV REFRESHED_AT 2016-11-04 ### install Filebeat -ENV FILEBEAT_VERSION 5.6.9 +ENV FILEBEAT_VERSION 5.6.10 RUN apt-get update -qq \ && apt-get install -qqy curl \ diff --git a/spec/Dockerfile_spec.rb b/spec/Dockerfile_spec.rb index 36763082..69246f79 100644 --- a/spec/Dockerfile_spec.rb +++ b/spec/Dockerfile_spec.rb @@ -1,7 +1,7 @@ require "docker" require "serverspec" -ELK_VERSION = "5.6.9" +ELK_VERSION = "5.6.10" ELASTICSEARCH_VERSION = ELK_VERSION LOGSTASH_VERSION = ELK_VERSION KIBANA_VERSION = ELK_VERSION diff --git a/start.sh b/start.sh index 47878723..51984baa 100644 --- a/start.sh +++ b/start.sh @@ -36,6 +36,12 @@ rm -f /var/run/elasticsearch/elasticsearch.pid /var/run/logstash.pid \ OUTPUT_LOGFILES="" +## override default time zone (Etc/UTC) if TZ variable is set +if [ ! -z "$TZ" ]; then + ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +fi + + ## run pre-hooks if [ -x /usr/local/bin/elk-pre-hooks.sh ]; then . /usr/local/bin/elk-pre-hooks.sh