diff options
Diffstat (limited to 'docker-compose')
| -rw-r--r-- | docker-compose/README.md | 4 | ||||
| -rwxr-xr-x | docker-compose/docker-compose.yml | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/docker-compose/README.md b/docker-compose/README.md index 0b84e0a567..6fa222908c 100644 --- a/docker-compose/README.md +++ b/docker-compose/README.md @@ -14,14 +14,14 @@ mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-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 -Pncmp-docker -Pcps-ncmp-docker -Dnexus.repository= +mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-docker -Ddocker.repository.push= ``` * Following command builds the JAR file and generates the Docker image for specified CPS component: (with `<docker-profile>` being one of `cps-docker`, `ncmp-docker` or `cps-ncmp-docker`): ```bash -mvn clean install -P<docker-profile> -Dnexus.repository= +mvn clean install -P<docker-profile> -Ddocker.repository.push= ``` ## Running Docker containers diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 8b6414eed3..f01d12da28 100755 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -21,13 +21,13 @@ version: "3.7" services: #cps-standalone: # container_name: cps-service - # image: cps-service:${VERSION} - # volumes: - # - "./application.yml:/app/resources/application.yml" + # image: onap/cps-service:${VERSION:-latest} # ports: # - "8881:8080" # environment: - # DB_HOST: ${DB_HOST} + # CPS_USERNAME: ${CPS_USERNAME:-cpsuser} + # CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!} + # DB_HOST: dbpostgresql # DB_USERNAME: ${DB_USERNAME} # DB_PASSWORD: ${DB_PASSWORD} # restart: unless-stopped @@ -36,13 +36,13 @@ services: #ncmp-standalone: # container_name: cps-ncmp - # image: cps-ncmp:${VERSION} - # volumes: - # - "./application.yml:/app/resources/application.yml" + # image: onap/cps-ncmp:${VERSION:-latest} # ports: # - "8882:8080" # environment: - # DB_HOST: ${DB_HOST} + # CPS_USERNAME: ${CPS_USERNAME:-cpsuser} + # CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!} + # DB_HOST: dbpostgresql # DB_USERNAME: ${DB_USERNAME} # DB_PASSWORD: ${DB_PASSWORD} # restart: unless-stopped @@ -51,7 +51,7 @@ services: cps-and-ncmp: container_name: cps-and-ncmp - image: cps-and-ncmp:${VERSION} + image: onap/cps-and-ncmp:${VERSION:-latest} ports: - "8883:8080" environment: |