Skip to content

Commit 19f0b1d

Browse files
larsbijlLars van der Bijl
and
Lars van der Bijl
authoredApr 17, 2021
Simplify docker compose setup. (AcademySoftwareFoundation#933)
Place docker-compose at the root of the project. Remove some of the variable user needed to setup with defaults. As we can asume a person is running this as a test and not in production with docker-compose. process to start is now. `docker-compose up` in the root of the project. Co-authored-by: Lars van der Bijl <[email protected]>
1 parent 9e0b6bf commit 19f0b1d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed
 

‎sandbox/docker-compose.yml ‎docker-compose.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
image: postgres
66
environment:
77
- POSTGRES_USER=cuebot
8-
- POSTGRES_PASSWORD=$POSTGRES_PASSWORD
8+
- POSTGRES_PASSWORD=cuebot_password
99
- POSTGRES_DB=cuebot
1010
ports:
1111
- "5432:5432"
@@ -22,7 +22,7 @@ services:
2222
- db
2323
environment:
2424
- PGUSER=cuebot
25-
- PGPASSWORD=$POSTGRES_PASSWORD
25+
- PGPASSWORD=cuebot_password
2626
- PGDATABASE=cuebot
2727
- PGHOST=db
2828
- PGPORT=5432
@@ -39,8 +39,8 @@ services:
3939
- flyway
4040
restart: always
4141
environment:
42-
- CUE_FRAME_LOG_DIR=$CUE_FRAME_LOG_DIR
43-
command: --datasource.cue-data-source.jdbc-url=jdbc:postgresql://db/cuebot --datasource.cue-data-source.username=cuebot --datasource.cue-data-source.password=$POSTGRES_PASSWORD
42+
- CUE_FRAME_LOG_DIR=/tmp/rqd/logs
43+
command: --datasource.cue-data-source.jdbc-url=jdbc:postgresql://db/cuebot --datasource.cue-data-source.username=cuebot --datasource.cue-data-source.password=cuebot_password
4444

4545
rqd:
4646
image: opencue/rqd

‎sandbox/docker-compose.monitoring.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
environment:
1414
- DATA_SOURCE_URI=db:5432/postgres?sslmode=disable
1515
- DATA_SOURCE_USER=cuebot
16-
- DATA_SOURCE_PASS=$POSTGRES_PASSWORD
16+
- DATA_SOURCE_PASS=cuebot_password
1717
- PG_EXPORTER_AUTO_DISCOVER_DATABASES=true
1818
ports:
1919
- 9187:9187

0 commit comments

Comments
 (0)