diff options
| author |   Niamh Core <niamh.core@est.tech> | 2021-10-21 15:00:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-10-21 15:00:53 +0000 |
| commit | c9b89447ce2eab16206d6fee11fda59a35cb64cf (patch) | |
| tree | c366ec8fa3b8b2d0bdd384288a41ac61d93536ae /docker-compose/docker-compose.yml | |
| parent | 46e5b98302f3c909648a83d622d48ccd5d71595a (diff) | |
| parent | dd6021e12851eb89e6674d5f4c03ffae4d08e230 (diff) | |
Merge "fix docker-compose for ncmp"
Diffstat (limited to 'docker-compose/docker-compose.yml')
| -rwxr-xr-x | docker-compose/docker-compose.yml | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index c928ee88b0..5bdff9d79a 100755 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -97,13 +97,13 @@ services: cps-and-ncmp: container_name: cps-and-ncmp - image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${VERSION:-latest} + image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${CPS_VERSION:-latest} ports: - - "8883:8080" - - "8887:8081" + - ${CPS_CORE_PORT:-8883}:8080 + - ${CPS_CORE_MANAGEMENT_PORT:-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: ${DB_HOST} DB_USERNAME: ${DB_USERNAME:-cps} DB_PASSWORD: ${DB_PASSWORD:-cps} @@ -114,26 +114,4 @@ services: #NOTIFICATION_DATASPACE_FILTER_PATTERNS: '.*' restart: unless-stopped depends_on: - - dbpostgresql - - ncmp-dmi-plugin: - container_name: ncmp-dmi-plugin - image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${VERSION:-latest} - ports: - - "8783:8080" - - "8787:8081" - environment: - DMI_USERNAME: ${DMI_USERNAME:-cpsuser} - DMI_PASSWORD: ${DMI_PASSWORD:-cpsr0cks!} - CPS_CORE_HOST: ${CPS_CORE_HOST} - CPS_CORE_PORT: ${CPS_CORE_PORT:-8883} - CPS_CORE_USERNAME: ${CPS_CORE_USERNAME:-cpsuser} - CPS_CORE_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!} - SDNC_HOST: ${SDNC_HOST} - SDNC_PORT: ${SDNC_PORT:-8282} - SDNC_USERNAME: ${SDNC_USERNAME:-admin} - SDNC_PASSWORD: ${SDNC_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} - DMI_SERVICE_URL: ${DMI_SERVICE_URL} - restart: unless-stopped - depends_on: - - cps-and-ncmp #it depends on cps_and_ncmp for registration but as a container it can run independently.
\ No newline at end of file + - dbpostgresql
\ No newline at end of file |