summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenu Kumari <renu.kumari@bell.ca>2021-04-01 10:44:31 -0400
committerRenu Kumari <renu.kumari@bell.ca>2021-04-06 15:35:21 -0400
commitd138529fe66f39b17047091d7e54117845ba9b50 (patch)
treeda8ab1c6b0f73353174ee9b7b672374de19d5290
parentf760afcbdeb6147ebd97ce43c055dce85e0bcfa0 (diff)
Moved application.yml under cps-application
Issue-ID: CPS-248 Signed-off-by: Renu Kumari <renu.kumari@bell.ca> Change-Id: Ibfe68684784a9bd38e9e1e5d6a5e7909c4c11909
-rw-r--r--cps-application/src/main/resources/application.yml (renamed from docker-compose/application.yml)0
-rw-r--r--docker-compose/README.md6
-rw-r--r--docker-compose/docker-compose.yml4
3 files changed, 3 insertions, 7 deletions
diff --git a/docker-compose/application.yml b/cps-application/src/main/resources/application.yml
index d9b9e7c38d..d9b9e7c38d 100644
--- a/docker-compose/application.yml
+++ b/cps-application/src/main/resources/application.yml
diff --git a/docker-compose/README.md b/docker-compose/README.md
index e443bdf2eb..3e9cd63169 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -34,7 +34,7 @@ It starts both Postgres database and CPS services.
2. Execute following command from `docker-compose` folder:
```bash
-VERSION=x.y.z-SNAPSHOT DB_HOST=dbpostgresql DB_USERNAME=cps DB_PASSWORD=cps docker-compose up -d
+VERSION=x.y.z-SNAPSHOT DB_USERNAME=cps DB_PASSWORD=cps docker-compose up -d
```
## Running or debugging Java built code
@@ -56,8 +56,7 @@ Following command starts the application using JAR file:
```bash
DB_HOST=localhost DB_USERNAME=cps DB_PASSWORD=cps \
- java -classpath cps-application/target/cps-application-x.y.z-SNAPSHOT.jar:docker-compose \
- org.springframework.boot.loader.JarLauncher
+ java -jar cps-application/target/cps-application-x.y.z-SNAPSHOT.jar
```
### Running from IntelliJ IDE
@@ -66,7 +65,6 @@ 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:
- * `Working directory`: docker-compose folder, e.g. `$ProjectFileDir$/docker-compose`
* `Environment variables`: `DB_HOST=localhost;DB_USERNAME=cps;DB_PASSWORD=cps`
## Accessing services
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 4da74584c4..0cd49512a9 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -52,12 +52,10 @@ services:
cps-and-ncmp:
container_name: cps-and-ncmp
image: cps-and-ncmp:${VERSION}
- volumes:
- - "./application.yml:/app/resources/application.yml"
ports:
- "8883:8080"
environment:
- DB_HOST: ${DB_HOST}
+ DB_HOST: dbpostgresql
DB_USERNAME: ${DB_USERNAME}
DB_PASSWORD: ${DB_PASSWORD}
restart: unless-stopped