Unverified Commit 0a5c21db authored by Michał Siatkowski's avatar Michał Siatkowski Committed by Antoine Cotten

Revert "Set ELK components version from .env file"

This reverts commit 5075cafe.

Fixes #205
parent b11e03ce
ELK_VERSION=6.0.0
...@@ -38,8 +38,6 @@ Based on the official Docker images: ...@@ -38,8 +38,6 @@ Based on the official Docker images:
6. [JVM tuning](#jvm-tuning) 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 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) * [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 ## Requirements
...@@ -287,18 +285,3 @@ logstash: ...@@ -287,18 +285,3 @@ logstash:
environment: 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" 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.
...@@ -5,8 +5,6 @@ services: ...@@ -5,8 +5,6 @@ services:
elasticsearch: elasticsearch:
build: build:
context: elasticsearch/ context: elasticsearch/
args:
ELK_VERSION: $ELK_VERSION
volumes: volumes:
- ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
ports: ports:
...@@ -21,8 +19,6 @@ services: ...@@ -21,8 +19,6 @@ services:
logstash: logstash:
build: build:
context: logstash/ context: logstash/
args:
ELK_VERSION: $ELK_VERSION
volumes: volumes:
- ./logstash/pipeline:/usr/share/logstash/pipeline - ./logstash/pipeline:/usr/share/logstash/pipeline
ports: ports:
...@@ -37,8 +33,6 @@ services: ...@@ -37,8 +33,6 @@ services:
kibana: kibana:
build: build:
context: kibana/ context: kibana/
args:
ELK_VERSION: $ELK_VERSION
ports: ports:
- "5601:5601" - "5601:5601"
networks: networks:
......
ARG ELK_VERSION
# https://github.com/elastic/elasticsearch-docker # https://github.com/elastic/elasticsearch-docker
FROM docker.elastic.co/elasticsearch/elasticsearch-basic:${ELK_VERSION} FROM docker.elastic.co/elasticsearch/elasticsearch-basic:6.0.0
# Add your elasticsearch plugins setup here # Add your elasticsearch plugins setup here
# Example: RUN elasticsearch-plugin install analysis-icu # Example: RUN elasticsearch-plugin install analysis-icu
ARG ELK_VERSION
# https://github.com/elastic/kibana-docker # https://github.com/elastic/kibana-docker
FROM docker.elastic.co/kibana/kibana-x-pack:${ELK_VERSION} FROM docker.elastic.co/kibana/kibana-x-pack:6.0.0
# Add your kibana plugins setup here # Add your kibana plugins setup here
# Example: RUN kibana-plugin install <name|url> # Example: RUN kibana-plugin install <name|url>
ARG ELK_VERSION
# https://github.com/elastic/logstash-docker # https://github.com/elastic/logstash-docker
FROM docker.elastic.co/logstash/logstash-x-pack:${ELK_VERSION} FROM docker.elastic.co/logstash/logstash-x-pack:6.0.0
# Add your logstash plugins setup here # Add your logstash plugins setup here
# Example: RUN logstash-plugin install logstash-filter-json # Example: RUN logstash-plugin install logstash-filter-json
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment