From 8f5b242d6a51615899ae920cc420b6393853ebcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Siatkowski?= <atais.jr@gmail.com>
Date: Fri, 1 Dec 2017 10:58:07 +0100
Subject: [PATCH] Revert "Set ELK components version from .env file" (#206)

This reverts commit 5075cafea0b38fe9e14bf35f6fc6855a11bd74d9.

Fixes #205
---
 .env                     |  1 -
 README.md                | 17 -----------------
 docker-compose.yml       |  6 ------
 elasticsearch/Dockerfile |  4 +---
 kibana/Dockerfile        |  4 +---
 logstash/Dockerfile      |  4 +---
 6 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 .env

diff --git a/.env b/.env
deleted file mode 100644
index 92170f6..0000000
--- a/.env
+++ /dev/null
@@ -1 +0,0 @@
-ELK_VERSION=6.0.0
diff --git a/README.md b/README.md
index 7be7f95..f61cf1b 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,6 @@ Based on the official Docker images:
 6. [JVM tuning](#jvm-tuning)
    * [How can I specify the amount of memory used by a service?](#how-can-i-specify-the-amount-of-memory-used-by-a-service)
    * [How can I enable a remote JMX connection to a service?](#how-can-i-enable-a-remote-jmx-connection-to-a-service)
-7. [Updates](#updates)
-   * [Using a newer stack version](#using-a-newer-stack-version)
 
 ## Requirements
 
@@ -255,18 +253,3 @@ logstash:
   environment:
     LS_JAVA_OPTS: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=18080 -Dcom.sun.management.jmxremote.rmi.port=18080 -Djava.rmi.server.hostname=DOCKER_HOST_IP -Dcom.sun.management.jmxremote.local.only=false"
 ```
-
-## Updates
-
-### Using a newer stack version
-
-To use a different Elastic Stack version than the one currently available in the repository, simply change the version
-number inside the `.env` file, and rebuild the stack with:
-
-```console
-$ docker-compose build
-$ docker-compose up
-```
-
-**NOTE**: Always pay attention to the [upgrade instructions](https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-upgrade.html)
-for each individual component before performing a stack upgrade.
diff --git a/docker-compose.yml b/docker-compose.yml
index 13b7f8a..b81fc98 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,8 +5,6 @@ services:
   elasticsearch:
     build:
       context: elasticsearch/
-      args:
-        ELK_VERSION: $ELK_VERSION
     volumes:
       - ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
     ports:
@@ -20,8 +18,6 @@ services:
   logstash:
     build:
       context: logstash/
-      args:
-        ELK_VERSION: $ELK_VERSION
     volumes:
       - ./logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro
       - ./logstash/pipeline:/usr/share/logstash/pipeline
@@ -37,8 +33,6 @@ services:
   kibana:
     build:
       context: kibana/
-      args:
-        ELK_VERSION: $ELK_VERSION
     volumes:
       - ./kibana/config/:/usr/share/kibana/config:ro
     ports:
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index f2f4f56..0ad46d8 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,7 +1,5 @@
-ARG ELK_VERSION
-
 # https://github.com/elastic/elasticsearch-docker
-FROM docker.elastic.co/elasticsearch/elasticsearch-oss:${ELK_VERSION}
+FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.0.0
 
 # Add your elasticsearch plugins setup here
 # Example: RUN elasticsearch-plugin install analysis-icu
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 25d3fa8..1785734 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,7 +1,5 @@
-ARG ELK_VERSION
-
 # https://github.com/elastic/kibana-docker
-FROM docker.elastic.co/kibana/kibana-oss:${ELK_VERSION}
+FROM docker.elastic.co/kibana/kibana-oss:6.0.0
 
 # Add your kibana plugins setup here
 # Example: RUN kibana-plugin install <name|url>
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index 715f662..2269821 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,7 +1,5 @@
-ARG ELK_VERSION
-
 # https://github.com/elastic/logstash-docker
-FROM docker.elastic.co/logstash/logstash-oss:${ELK_VERSION}
+FROM docker.elastic.co/logstash/logstash-oss:6.0.0
 
 # Add your logstash plugins setup here
 # Example: RUN logstash-plugin install logstash-filter-json