summaryrefslogtreecommitdiffstats
path: root/docker-compose
diff options
context:
space:
mode:
Diffstat (limited to 'docker-compose')
-rw-r--r--docker-compose/README.md5
-rw-r--r--docker-compose/docker-compose.yml2
2 files changed, 5 insertions, 2 deletions
diff --git a/docker-compose/README.md b/docker-compose/README.md
index 3e9cd63169..4d20ece044 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -55,7 +55,7 @@ Then CPS can be started either using a Java Archive previously built or directly
Following command starts the application using JAR file:
```bash
-DB_HOST=localhost DB_USERNAME=cps DB_PASSWORD=cps \
+DB_HOST=localhost DB_USERNAME=cps DB_PASSWORD=cps CPS_USERNAME=cpsuser CPS_PASSWORD=cpsr0cks! \
java -jar cps-application/target/cps-application-x.y.z-SNAPSHOT.jar
```
@@ -65,7 +65,8 @@ Here are the steps to run or debug the application from Intellij:
1. Enable the desired maven profile form Maven Tool Window
2. Run a configuration from `Run -> Edit configurations` with following settings:
- * `Environment variables`: `DB_HOST=localhost;DB_USERNAME=cps;DB_PASSWORD=cps`
+ * `Environment variables`: `DB_HOST=localhost;DB_USERNAME=cps;DB_PASSWORD=cps
+ CPS_USERNAME=cpsuser CPS_PASSWORD=cpsr0cks!`
## Accessing services
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 0cd49512a9..2251304275 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -55,6 +55,8 @@ services:
ports:
- "8883:8080"
environment:
+ CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
+ CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
DB_HOST: dbpostgresql
DB_USERNAME: ${DB_USERNAME}
DB_PASSWORD: ${DB_PASSWORD}