Merge pull request #14429 from grafana/docker-blocks-links

Docker blocks: Use links instead of bridge network
This commit is contained in:
Torkel Ödegaard 2018-12-11 09:14:54 +01:00 committed by GitHub
commit 71bf5ca8c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions

View File

@ -1,15 +1,18 @@
# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine # You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
version: '2'
services:
elasticsearch5: elasticsearch5:
image: elasticsearch:5 image: elasticsearch:5
command: elasticsearch command: elasticsearch
ports: ports:
- "10200:9200" - '10200:9200'
- "10300:9300" - '10300:9300'
fake-elastic5-data: fake-elastic5-data:
image: grafana/fake-data-gen image: grafana/fake-data-gen
network_mode: bridge links:
- elasticsearch5
# network_mode: bridge
environment: environment:
FD_DATASOURCE: elasticsearch FD_DATASOURCE: elasticsearch
FD_PORT: 10200 FD_PORT: 10200

View File

@ -1,17 +1,19 @@
version: '2'
services:
influxdb: influxdb:
image: influxdb:latest image: influxdb:latest
container_name: influxdb container_name: influxdb
ports: ports:
- "2004:2004" - '2004:2004'
- "8083:8083" - '8083:8083'
- "8086:8086" - '8086:8086'
volumes: volumes:
- ./docker/blocks/influxdb/influxdb.conf:/etc/influxdb/influxdb.conf - ./docker/blocks/influxdb/influxdb.conf:/etc/influxdb/influxdb.conf
fake-influxdb-data: fake-influxdb-data:
image: grafana/fake-data-gen image: grafana/fake-data-gen
network_mode: bridge links:
- influxdb
environment: environment:
FD_DATASOURCE: influxdb FD_DATASOURCE: influxdb
FD_PORT: 8086 FD_PORT: 8086