Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Setup a docker-compose override file. #843

Merged
merged 5 commits into from
Jul 15, 2016
Merged

Setup a docker-compose override file. #843

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bde9fa4
Setup a docker-compose override file.
tecnobrat Jul 7, 2016
f3656d2
Fix duplicate relay stuff
tecnobrat Jul 7, 2016
4a18335
Fix hostnames to make more sense.
tecnobrat Jul 14, 2016
f150a9e
Update vars.
tecnobrat Jul 14, 2016
0f9485a
Document how do use the override
tecnobrat Jul 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ erl_crash.dump
/data
Mnesia.*
/cover
docker-compose.yml
docker-compose.override.yml
.env
28 changes: 28 additions & 0 deletions docker-compose.override.example.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
postgres:
environment:
- POSTGRES_USER=cog
- POSTGRES_PASSWORD=cog

cog:
environment:
- DATABASE_URL=ecto://cog:cog@localhost:5432/cog
- COG_ADAPTER=slack
- SLACK_API_TOKEN=xxxx-000000-0000000
- COG_BOOTSTRAP_EMAIL_ADDRESS=foo@bar.com
- COG_BOOTSTRAP_FIRST_NAME=foo
- COG_BOOTSTRAP_LAST_NAME=bar
- COG_BOOTSTRAP_PASSWORD=foobar
- COG_BOOTSTRAP_USERNAME=foo
- COG_API_URL_HOST=192.168.99.100
- COG_API_URL_PORT=80
- COG_TRIGGER_URL_HOST=192.168.99.100
- COG_TRIGGER_URL_PORT=4001
- COG_SERVICE_URL_HOST=192.168.99.100
- COG_SERVICE_URL_PORT=4002
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps these ports can be in the base docker-compose

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I think they make sense in the base because they match the defaults from Cog.

- RELAY_ID=00000000-0000-0000-0000-000000000000
- RELAY_COG_TOKEN=supersecret

relay:
environment:
- RELAY_ID=00000000-0000-0000-0000-000000000000
- RELAY_COG_TOKEN=supersecret
13 changes: 0 additions & 13 deletions docker-compose-example.yml → docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,7 @@ postgres:
cog:
image: operable/cog:0.9.1
environment:
- DATABASE_URL=ecto://cog:cog@localhost:5432/cog
- COG_ADAPTER=slack
- SLACK_API_TOKEN=${SLACK_API_TOKEN}
- COG_MQTT_HOST=0.0.0.0
- COG_API_URL_HOST=${COG_HOST}
- COG_API_URL_PORT=80
- COG_TRIGGER_URL_HOST=${COG_HOST}
- COG_TRIGGER_URL_PORT=4001
- COG_SERVICE_URL_HOST=${COG_HOST}
- COG_SERVICE_URL_PORT=4002
- RELAY_ID=00000000-0000-0000-0000-000000000000
- RELAY_COG_TOKEN=supersecret
links:
- postgres:localhost
ports:
Expand All @@ -68,8 +57,6 @@ relay:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
environment:
- RELAY_ID=00000000-0000-0000-0000-000000000000
- RELAY_COG_TOKEN=supersecret
- RELAY_COG_REFRESH_INTERVAL=30s
- RELAY_DOCKER_CLEAN_INTERVAL=1m
- RELAY_COG_HOST=localhost
Expand Down