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

Simplify docker compose setup. #933

Merged
merged 1 commit into from
Apr 17, 2021
Merged

Simplify docker compose setup. #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions sandbox/docker-compose.yml → docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
image: postgres
environment:
- POSTGRES_USER=cuebot
- POSTGRES_PASSWORD=$POSTGRES_PASSWORD
- POSTGRES_PASSWORD=cuebot_password
- POSTGRES_DB=cuebot
ports:
- "5432:5432"
Expand All @@ -22,7 +22,7 @@ services:
- db
environment:
- PGUSER=cuebot
- PGPASSWORD=$POSTGRES_PASSWORD
- PGPASSWORD=cuebot_password
- PGDATABASE=cuebot
- PGHOST=db
- PGPORT=5432
Expand All @@ -39,8 +39,8 @@ services:
- flyway
restart: always
environment:
- CUE_FRAME_LOG_DIR=$CUE_FRAME_LOG_DIR
command: --datasource.cue-data-source.jdbc-url=jdbc:postgresql://db/cuebot --datasource.cue-data-source.username=cuebot --datasource.cue-data-source.password=$POSTGRES_PASSWORD
- CUE_FRAME_LOG_DIR=/tmp/rqd/logs
command: --datasource.cue-data-source.jdbc-url=jdbc:postgresql://db/cuebot --datasource.cue-data-source.username=cuebot --datasource.cue-data-source.password=cuebot_password

rqd:
image: opencue/rqd
Expand Down
2 changes: 1 addition & 1 deletion sandbox/docker-compose.monitoring.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
environment:
- DATA_SOURCE_URI=db:5432/postgres?sslmode=disable
- DATA_SOURCE_USER=cuebot
- DATA_SOURCE_PASS=$POSTGRES_PASSWORD
- DATA_SOURCE_PASS=cuebot_password
- PG_EXPORTER_AUTO_DISCOVER_DATABASES=true
ports:
- 9187:9187
Expand Down