Dropped docker-compose heritage

Change-Id: Ic6bf277ef5f04f006abee15533beb5f7f6073ce0
This commit is contained in:
aviau 2015-05-06 14:54:46 -04:00
parent 4faab4620b
commit afd447d85f
3 changed files with 34 additions and 64 deletions

View File

@ -1,26 +0,0 @@
surveil:
build: .
shinken:
build: tools/docker/shinken_container/
mongo:
image: mongo
influxdb:
image: savoirfairelinux/influxdb
grafana:
image: savoirfairelinux/grafana
environment:
INFLUXDB_HOST: "influxdb"
INFLUXDB_PORT: "8086"
INFLUXDB_NAME: "db"
INFLUXDB_USER: "root"
INFLUXDB_PASS: "root"
bansho:
image: savoirfairelinux/bansho
environment:
BANSHO_BACKEND: "surveil"
BANSHO_SURVEIL_URL: "http://surveil:8080/"

View File

@ -1,7 +1,6 @@
surveil: surveil:
extends: #build: .
file: docker-compose-common.yml image: savoirfairelinux/surveil:0.1.0
service: surveil
links: links:
- mongo - mongo
- influxdb - influxdb
@ -12,9 +11,8 @@ surveil:
PBR_VERSION: "PROD" PBR_VERSION: "PROD"
shinken: shinken:
extends: #build: tools/docker/shinken_container/
file: docker-compose-common.yml image: savoirfairelinux/surveil-shinken:0.1.0
service: shinken
links: links:
- mongo - mongo
- influxdb - influxdb
@ -22,9 +20,7 @@ shinken:
- "7767:7767" - "7767:7767"
mongo: mongo:
extends: image: mongo
file: docker-compose-common.yml
service: mongo
ports: ports:
- "27017:27017" - "27017:27017"
command: command:
@ -33,9 +29,7 @@ mongo:
- ./container-data/mongodb:/data/db - ./container-data/mongodb:/data/db
influxdb: influxdb:
extends: image: savoirfairelinux/influxdb
file: docker-compose-common.yml
service: influxdb
environment: environment:
PRE_CREATE_DB: "db" PRE_CREATE_DB: "db"
ports: ports:
@ -45,19 +39,24 @@ influxdb:
- ./container-data/influxdb:/data - ./container-data/influxdb:/data
grafana: grafana:
extends: image: savoirfairelinux/grafana
file: docker-compose-common.yml environment:
service: grafana INFLUXDB_HOST: "influxdb"
INFLUXDB_PORT: "8086"
INFLUXDB_NAME: "db"
INFLUXDB_USER: "root"
INFLUXDB_PASS: "root"
ports: ports:
- "80:80" - "8888:80"
links: links:
- influxdb - influxdb
bansho: bansho:
extends: image: savoirfairelinux/bansho:0.2.0
file: docker-compose-common.yml environment:
service: bansho BANSHO_BACKEND: "surveil"
BANSHO_SURVEIL_URL: "http://surveil:8080/"
ports: ports:
- "8888:8888" - "80:8888"
links: links:
- surveil - surveil

View File

@ -1,7 +1,5 @@
surveil: surveil:
extends: build: .
file: docker-compose-common.yml
service: surveil
links: links:
- mongo - mongo
- influxdb - influxdb
@ -15,9 +13,7 @@ surveil:
command: bash -c "cd /surveil/ && python setup.py develop && ((sleep 40 && surveil-init --demo) &) && sleep 20 && surveil-api --reload" command: bash -c "cd /surveil/ && python setup.py develop && ((sleep 40 && surveil-init --demo) &) && sleep 20 && surveil-api --reload"
shinken: shinken:
extends: build: tools/docker/shinken_container/
file: docker-compose-common.yml
service: shinken
links: links:
- mongo - mongo
- influxdb - influxdb
@ -25,18 +21,14 @@ shinken:
- "7767:7767" - "7767:7767"
mongo: mongo:
extends: image: mongo
file: docker-compose-common.yml
service: mongo
ports: ports:
- "27017:27017" - "27017:27017"
command: command:
"mongod --nojournal --smallfiles" "mongod --nojournal --smallfiles"
influxdb: influxdb:
extends: image: savoirfairelinux/influxdb
file: docker-compose-common.yml
service: influxdb
environment: environment:
PRE_CREATE_DB: "db" PRE_CREATE_DB: "db"
ports: ports:
@ -44,18 +36,23 @@ influxdb:
- "8086:8086" - "8086:8086"
grafana: grafana:
extends: image: savoirfairelinux/grafana
file: docker-compose-common.yml environment:
service: grafana INFLUXDB_HOST: "influxdb"
INFLUXDB_PORT: "8086"
INFLUXDB_NAME: "db"
INFLUXDB_USER: "root"
INFLUXDB_PASS: "root"
ports: ports:
- "80:80" - "80:80"
links: links:
- influxdb - influxdb
bansho: bansho:
extends: image: savoirfairelinux/bansho
file: docker-compose-common.yml environment:
service: bansho BANSHO_BACKEND: "surveil"
BANSHO_SURVEIL_URL: "http://surveil:8080/"
ports: ports:
- "8888:8888" - "8888:8888"
links: links: