diff options
| author |   Bruno Sakoto <bruno.sakoto@bell.ca> | 2022-02-03 17:21:02 -0500 |
|---|---|---|
| committer | Bruno Sakoto <bruno.sakoto@bell.ca> | 2022-02-07 11:00:03 -0500 |
| commit | 88d2299942d40442a63c7b39f443a654542bccac (patch) | |
| tree | 9a6d9436ad8bb79fc23b0abb8f664cc42c2bbfd5 | |
| parent | c2a98631112128093d4f601284bb30928539f242 (diff) | |
Fix docker compose for csit testmr/879/126960/2
Use proxy repository and Istanbul version for Dmi Plugin docker image.
Issue-ID: CPS-879
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: Ic64503f229dae83074569ab2175df2efea5162c7
| -rwxr-xr-x | csit/plans/cps/setup.sh | 4 | ||||
| -rwxr-xr-x | docker-compose/docker-compose.yml | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/csit/plans/cps/setup.sh b/csit/plans/cps/setup.sh index 2fc0ec4877..19466e6754 100755 --- a/csit/plans/cps/setup.sh +++ b/csit/plans/cps/setup.sh @@ -17,7 +17,7 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # Modifications copyright (c) 2020-2021 Samsung Electronics Co., Ltd. # Modifications Copyright (C) 2021 Pantheon.tech -# Modifications Copyright (C) 2021 Bell Canada. +# Modifications Copyright (C) 2021-2022 Bell Canada. # Modifications Copyright (C) 2021 Nordix Foundation. # # Branched from ccsdk/distribution to this repository Feb 23, 2021 @@ -36,8 +36,6 @@ export SDNC_HOST=$LOCAL_IP export CPS_CORE_HOST=$LOCAL_IP export DB_USERNAME=cps export DB_PASSWORD=cps -# Use latest image version -export VERSION=latest # download docker-compose of a required version (1.25.0 supports configuration of version 3.7) curl -L https://github.com/docker/compose/releases/download/1.25.0/docker-compose-`uname -s`-`uname -m` > docker-compose diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 660ca820cc..24828a84a8 100755 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -1,6 +1,6 @@ # ============LICENSE_START======================================================= # Copyright (c) 2020 Pantheon.tech. -# Modifications Copyright (C) 2021 Bell Canada. +# Modifications Copyright (C) 2021-2022 Bell Canada. # Modifications Copyright (C) 2021 Nordix Foundation # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -97,7 +97,7 @@ 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_CPS_AND_NCMP:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${VERSION_CPS_AND_NCMP:-latest} ports: - "8883:8080" - "8887:8081" @@ -118,7 +118,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_DMI_PLUGIN:-nexus3.onap.org:10001}/onap/ncmp-dmi-plugin:${VERSION_DMI_PLUGIN:-1.0.3} ports: - "8783:8080" - "8787:8081" |