diff options
| author |   Niamh Core <niamh.core@est.tech> | 2021-10-21 14:35:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-10-21 14:35:04 +0000 |
| commit | b53f60b89ce62fc623ea2aa0b2b1439709f8d270 (patch) | |
| tree | 40b27db79d216f655f8bbbe18a711e633c00ef82 | |
| parent | a013ea1d8355eda14f294bb210ffc4d466454af0 (diff) | |
| parent | 641cdb4da4c74acf49c8b548a32336c5bcbfc4ae (diff) | |
Merge "fix docker compose for ncmp/dmi"
| -rw-r--r-- | .gitreview | 3 | ||||
| -rwxr-xr-x | docker-compose/docker-compose.yml | 14 |
2 files changed, 8 insertions, 9 deletions
@@ -3,5 +3,4 @@ host=gerrit.onap.org port=29418 project=cps/ncmp-dmi-plugin - defaultbranch=master -
\ No newline at end of file + defaultbranch=istanbul diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index bec9bfec..25974baf 100755 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -22,13 +22,13 @@ version: "3.7" services: ncmp-dmi-plugin: container_name: ncmp-dmi-plugin - image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${VERSION:-latest} + image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${DMI_VERSION:-latest} ports: - - "8783:8080" - - "8787:8081" + - ${DMI_PORT:-8783}:8080 + - ${DMI_MANAGEMENT_PORT:-8787}:8081 environment: - CPS_USERNAME: ${CPS_USERNAME:-cpsuser} - CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!} + CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser} + CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!} CPS_CORE_HOST: ${CPS_CORE_HOST:-cps} CPS_CORE_PORT: ${CPS_CORE_PORT:-8080} CPS_CORE_USERNAME: ${CPS_CORE_USERNAME:-cpsuser} @@ -38,6 +38,6 @@ services: SDNC_USERNAME: ${SDNC_USERNAME:-admin} SDNC_PASSWORD: ${SDNC_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} DMI_SERVICE_URL: ${DMI_SERVICE_URL:-http://ncmp-dmi-plugin:8783} - DMI_USERNAME: "cpsuser" - DMI_PASSWORD: "cpsr0cks!" + DMI_USERNAME: ${DMI_USERNAME:-cpsuser} + DMI_PASSWORD: ${DMI_PASSWORD:-cpsr0cks!} restart: unless-stopped |