Permalink
Browse files

Upgrade to docker-compose v2

  • Loading branch information...
christophermaier committed Jan 6, 2017
1 parent 7cab465 commit 72b1f8ae2d4244c5bdd8d890a7378b9b09c22283
View
@@ -1,5 +1,7 @@
common:
environment:
- COG_API_URL_BASE=http://${COG_HOST}
- COG_TRIGGER_URL_BASE=http://${COG_HOST}:4001
- COG_SERVICE_URL_BASE=http://${COG_HOST}:4002
version: '2'
services:
common:
environment:
- COG_API_URL_BASE=http://${COG_HOST}
- COG_TRIGGER_URL_BASE=http://${COG_HOST}:4001
- COG_SERVICE_URL_BASE=http://${COG_HOST}:4002
@@ -1,19 +1,21 @@
cog:
environment:
- COG_HIPCHAT_ENABLED=1
- HIPCHAT_API_TOKEN=${HIPCHAT_API_TOKEN}
- HIPCHAT_JABBER_ID=${HIPCHAT_JABBER_ID}
- HIPCHAT_JABBER_PASSWORD=${HIPCHAT_JABBER_PASSWORD}
- HIPCHAT_NICKNAME=${HIPCHAT_NICKNAME}
- COG_BOOTSTRAP_USERNAME=admin
- COG_BOOTSTRAP_PASSWORD=changeme
- COG_BOOTSTRAP_EMAIL_ADDRESS=cog@localhost
- COG_BOOTSTRAP_FIRST_NAME=Cog
- COG_BOOTSTRAP_LAST_NAME=Administrator
- RELAY_ID=00000000-0000-0000-0000-000000000000
- RELAY_COG_TOKEN=supersecret
version: '2'
services:
cog:
environment:
- COG_HIPCHAT_ENABLED=1
- HIPCHAT_API_TOKEN=${HIPCHAT_API_TOKEN}
- HIPCHAT_JABBER_ID=${HIPCHAT_JABBER_ID}
- HIPCHAT_JABBER_PASSWORD=${HIPCHAT_JABBER_PASSWORD}
- HIPCHAT_NICKNAME=${HIPCHAT_NICKNAME}
- COG_BOOTSTRAP_USERNAME=admin
- COG_BOOTSTRAP_PASSWORD=changeme
- COG_BOOTSTRAP_EMAIL_ADDRESS=cog@localhost
- COG_BOOTSTRAP_FIRST_NAME=Cog
- COG_BOOTSTRAP_LAST_NAME=Administrator
- RELAY_ID=00000000-0000-0000-0000-000000000000
- RELAY_COG_TOKEN=supersecret
relay:
environment:
- RELAY_ID=00000000-0000-0000-0000-000000000000
- RELAY_COG_TOKEN=supersecret
relay:
environment:
- RELAY_ID=00000000-0000-0000-0000-000000000000
- RELAY_COG_TOKEN=supersecret
@@ -1,16 +1,18 @@
cog:
environment:
- COG_SLACK_ENABLED=1
- SLACK_API_TOKEN=${SLACK_API_TOKEN}
- COG_BOOTSTRAP_USERNAME=admin
- COG_BOOTSTRAP_PASSWORD=changeme
- COG_BOOTSTRAP_EMAIL_ADDRESS=cog@localhost
- COG_BOOTSTRAP_FIRST_NAME=Cog
- COG_BOOTSTRAP_LAST_NAME=Administrator
- RELAY_ID=00000000-0000-0000-0000-000000000000
- RELAY_COG_TOKEN=supersecret
version: '2'
services:
cog:
environment:
- COG_SLACK_ENABLED=1
- SLACK_API_TOKEN=${SLACK_API_TOKEN}
- COG_BOOTSTRAP_USERNAME=admin
- COG_BOOTSTRAP_PASSWORD=changeme
- COG_BOOTSTRAP_EMAIL_ADDRESS=cog@localhost
- COG_BOOTSTRAP_FIRST_NAME=Cog
- COG_BOOTSTRAP_LAST_NAME=Administrator
- RELAY_ID=00000000-0000-0000-0000-000000000000
- RELAY_COG_TOKEN=supersecret
relay:
environment:
- RELAY_ID=00000000-0000-0000-0000-000000000000
- RELAY_COG_TOKEN=supersecret
relay:
environment:
- RELAY_ID=00000000-0000-0000-0000-000000000000
- RELAY_COG_TOKEN=supersecret
View
@@ -39,43 +39,42 @@
#
# https://cog-book.operable.io/
#
postgres:
image: postgres:9.5
environment:
- POSTGRES_USER=cog
- POSTGRES_PASSWORD=cog
cog:
extends:
file: docker-compose.common.yml
service: common
image: operable/cog:latest
environment:
- COG_MQTT_HOST=0.0.0.0
- DATABASE_URL=ecto://cog:cog@postgres:5432/cog
links:
- postgres
ports:
- 1883
- 80:4000
- 4001:4001
- 4002:4002
entrypoint: /home/operable/cog/scripts/docker-start
relay:
extends:
file: docker-compose.common.yml
service: common
image: operable/relay:latest
privileged: true
volumes:
- /var/run/docker.sock:/var/run/docker.sock
environment:
- RELAY_COG_REFRESH_INTERVAL=30s
- RELAY_DOCKER_CLEAN_INTERVAL=1m
- RELAY_COG_HOST=cog
- RELAY_DYNAMIC_CONFIG_ROOT=/tmp/bundle_configs
links:
- cog
entrypoint: /usr/local/bin/relay
version: '2'
services:
postgres:
image: postgres:9.5
environment:
- POSTGRES_USER=cog
- POSTGRES_PASSWORD=cog
cog:
extends:
file: docker-compose.common.yml
service: common
image: operable/cog:latest
environment:
- COG_MQTT_HOST=0.0.0.0
- DATABASE_URL=ecto://cog:cog@postgres:5432/cog
depends_on:
- postgres
ports:
- 1883
- 80:4000
- 4001:4001
- 4002:4002
entrypoint: /home/operable/cog/scripts/docker-start
relay:
extends:
file: docker-compose.common.yml
service: common
image: operable/relay:latest
privileged: true
volumes:
- /var/run/docker.sock:/var/run/docker.sock
environment:
- RELAY_COG_REFRESH_INTERVAL=30s
- RELAY_DOCKER_CLEAN_INTERVAL=1m
- RELAY_COG_HOST=cog
- RELAY_DYNAMIC_CONFIG_ROOT=/tmp/bundle_configs
depends_on:
- cog
entrypoint: /usr/local/bin/relay

0 comments on commit 72b1f8a

Please sign in to comment.