diff options
| author |   Toine Siebelink <toine.siebelink@est.tech> | 2021-11-05 16:47:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-11-05 16:47:51 +0000 |
| commit | 94a4b4575f4b5bfe53817db831cc7270dc2abae9 (patch) | |
| tree | 0e445a173dd5ecb037ff252f2c2de0162a098150 | |
| parent | 30dfcb0cf5f1428bf3ebecbfad3d26c336a4553e (diff) | |
| parent | 9d9b12a83fbb6f10c3c2f66688405978f77b31c9 (diff) | |
Merge "Clean up commented sections to include CPS-CORE in variable names"
| -rw-r--r-- | docker-compose/README.md | 4 | ||||
| -rwxr-xr-x | docker-compose/docker-compose.yml | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docker-compose/README.md b/docker-compose/README.md index 3e6ab8367..623968f33 100644 --- a/docker-compose/README.md +++ b/docker-compose/README.md @@ -86,7 +86,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 CPS_USERNAME=cpsuser CPS_PASSWORD=cpsr0cks! \ +DB_HOST=localhost DB_USERNAME=cps DB_PASSWORD=cps CPS_CORE_USERNAME=cpsuser CPS_CORE_PASSWORD=cpsr0cks! \ java -jar cps-application/target/cps-application-x.y.z-SNAPSHOT.jar ``` @@ -97,7 +97,7 @@ 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 - CPS_USERNAME=cpsuser CPS_PASSWORD=cpsr0cks!` + CPS_CORE_USERNAME=cpsuser CPS_CORE_PASSWORD=cpsr0cks!` ## Accessing services diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 81d551901..d0a157e89 100755 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -30,8 +30,8 @@ services: # - "8881:8080" # - "8887:8081" # environment: - # CPS_USERNAME: ${CPS_USERNAME:-cpsuser} - # CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!} + # CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser} + # CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!} # DB_HOST: dbpostgresql # DB_USERNAME: ${DB_USERNAME:-cps} # DB_PASSWORD: ${DB_PASSWORD:-cps} @@ -49,8 +49,8 @@ services: # - "8882:8080" # - "8887:8081" # environment: - # CPS_USERNAME: ${CPS_USERNAME:-cpsuser} - # CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!} + # CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser} + # CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!} # DB_HOST: dbpostgresql # DB_USERNAME: ${DB_USERNAME:-cps} # DB_PASSWORD: ${DB_PASSWORD:-cps} |