diff options
Diffstat (limited to 'docker-compose/README.md')
| -rw-r--r-- | docker-compose/README.md | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/docker-compose/README.md b/docker-compose/README.md index 0a3828353..3e9cd6316 100644 --- a/docker-compose/README.md +++ b/docker-compose/README.md @@ -6,7 +6,7 @@ Following command builds all Java components to `cps-application/target/cps-appl without generating any docker images: ```bash -mvn clean install -Pcps-docker -Pxnf-docker -Pcps-xnf-docker -Djib.skip +mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-docker -Djib.skip ``` ## Building Java Archive and Docker images @@ -14,11 +14,11 @@ mvn clean install -Pcps-docker -Pxnf-docker -Pcps-xnf-docker -Djib.skip * Following command builds the JAR file and also generates the Docker image for all CPS components: ```bash -mvn clean install -Pcps-docker -Pxnf-docker -Pcps-xnf-docker -Dnexus.repository= +mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-docker -Dnexus.repository= ``` * Following command builds the JAR file and generates the Docker image for specified CPS component: - (with `<docker-profile>` being one of `cps-docker`, `xnf-docker` or `cps-xnf-docker`): + (with `<docker-profile>` being one of `cps-docker`, `ncmp-docker` or `cps-ncmp-docker`): ```bash mvn clean install -P<docker-profile> -Dnexus.repository= @@ -29,12 +29,12 @@ mvn clean install -P<docker-profile> -Dnexus.repository= `docker-compose/docker-compose.yml` file is provided to be run with `docker-compose` tool and images previously built. It starts both Postgres database and CPS services. -1. Edit `docker-compose.yml` and uncomment desired service to be deployed, by default `cps-and-nf-proxy` - is enabled. You can comment it and uncomment `cps-standalone` or `nf-proxy-standalone`. +1. Edit `docker-compose.yml` and uncomment desired service to be deployed, by default `cps-and-ncmp` + is enabled. You can comment it and uncomment `cps-standalone` or `ncmp-standalone`. 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 |