Commit 682c1896 authored by Anthony Lapenna's avatar Anthony Lapenna

Use depends_on and update README

parent 7154f0ae
...@@ -117,7 +117,9 @@ logstash: ...@@ -117,7 +117,9 @@ logstash:
- ./logstash/config:/etc/logstash/conf.d - ./logstash/config:/etc/logstash/conf.d
ports: ports:
- "5000:5000" - "5000:5000"
links: networks:
- docker_elk
depends_on:
- elasticsearch - elasticsearch
environment: environment:
- LS_HEAP_SIZE=2048m - LS_HEAP_SIZE=2048m
...@@ -144,7 +146,9 @@ logstash: ...@@ -144,7 +146,9 @@ logstash:
- ./logstash/config:/etc/logstash/conf.d - ./logstash/config:/etc/logstash/conf.d
ports: ports:
- "5000:5000" - "5000:5000"
links: networks:
- docker_elk
depends_on:
- elasticsearch - elasticsearch
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
...@@ -166,6 +170,8 @@ elasticsearch: ...@@ -166,6 +170,8 @@ elasticsearch:
- "9300:9300" - "9300:9300"
environment: environment:
ES_JAVA_OPTS: "-Xms1g -Xmx1g" ES_JAVA_OPTS: "-Xms1g -Xmx1g"
networks:
- docker_elk
volumes: volumes:
- ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
``` ```
...@@ -181,6 +187,8 @@ elasticsearch: ...@@ -181,6 +187,8 @@ elasticsearch:
- "9300:9300" - "9300:9300"
environment: environment:
ES_JAVA_OPTS: "-Xms1g -Xmx1g" ES_JAVA_OPTS: "-Xms1g -Xmx1g"
networks:
- docker_elk
``` ```
# Storage # Storage
...@@ -194,11 +202,14 @@ In order to persist Elasticsearch data even after removing the Elasticsearch con ...@@ -194,11 +202,14 @@ In order to persist Elasticsearch data even after removing the Elasticsearch con
```yml ```yml
elasticsearch: elasticsearch:
build: elasticsearch/ build: elasticsearch/
command: elasticsearch -Des.network.host=_non_loopback_ -Des.cluster.name: my-cluster
ports: ports:
- "9200:9200" - "9200:9200"
- "9300:9300" - "9300:9300"
environment: environment:
ES_JAVA_OPTS: "-Xms1g -Xmx1g" ES_JAVA_OPTS: "-Xms1g -Xmx1g"
networks:
- docker_elk
volumes: volumes:
- /path/to/storage:/usr/share/elasticsearch/data - /path/to/storage:/usr/share/elasticsearch/data
``` ```
......
...@@ -19,6 +19,8 @@ services: ...@@ -19,6 +19,8 @@ services:
- "5000:5000" - "5000:5000"
networks: networks:
- docker_elk - docker_elk
depends_on:
- elasticsearch
kibana: kibana:
build: kibana/ build: kibana/
volumes: volumes:
...@@ -27,6 +29,8 @@ services: ...@@ -27,6 +29,8 @@ services:
- "5601:5601" - "5601:5601"
networks: networks:
- docker_elk - docker_elk
depends_on:
- elasticsearch
networks: networks:
docker_elk: docker_elk:
......
FROM kibana:5 FROM kibana:5
RUN apt-get update && apt-get install -y netcat bzip2
COPY entrypoint.sh /tmp/entrypoint.sh
RUN chmod +x /tmp/entrypoint.sh
CMD ["/tmp/entrypoint.sh"]
#!/usr/bin/env bash
# Wait for the Elasticsearch container to be ready before starting Kibana.
echo "Stalling for Elasticsearch"
while true; do
nc -q 1 elasticsearch 9200 2>/dev/null && break
done
echo "Starting Kibana"
exec kibana
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