diff options
| -rwxr-xr-x | csit/plans/default/setup.sh | 5 | ||||
| -rwxr-xr-x | docker-compose.yml | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/csit/plans/default/setup.sh b/csit/plans/default/setup.sh index 7bf0340..3385bc0 100755 --- a/csit/plans/default/setup.sh +++ b/csit/plans/default/setup.sh @@ -1,7 +1,7 @@ #!/bin/bash # # ============LICENSE_START======================================================= -# Copyright (C) 2021 Bell Canada. +# Copyright (C) 2021-2022 Bell Canada. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -30,6 +30,9 @@ source $WORKSPACE/plans/default/setup.properties curl -L https://github.com/docker/compose/releases/download/1.25.0/docker-compose-`uname -s`-`uname -m` > docker-compose chmod +x docker-compose +# Set environment variables for docker compose +export CPS_TEMPORAL_DOCKER_REPO= +export STABLE_CPS_CORE_VERSION=3.0.0-SNAPSHOT-20220303T233031Z # start CPS Temporal, cps-core, timescaledb, PostgresSQL and kafka containers with docker compose ./docker-compose up -d python3 --version diff --git a/docker-compose.yml b/docker-compose.yml index 5ab43dd..b9d4e0c 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ # ============LICENSE_START======================================================= # Copyright (C) 2021 Nordix Foundation. -# Modifications Copyright (C) 2021 Bell Canada. +# Modifications Copyright (C) 2021-2022 Bell Canada. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ services: cps-temporal: container_name: cps-temporal - image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-temporal:latest + image: ${CPS_TEMPORAL_DOCKER_REPO-nexus3.onap.org:10003/}onap/cps-temporal:${CPS_TEMPORAL_VERSION:-latest} ports: - '8082:8080' - '8081:8081' @@ -71,7 +71,7 @@ services: cps-and-ncmp: container_name: cps-and-ncmp - image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${VERSION:-latest} + image: ${CPS_CORE_DOCKER_REPO-nexus3.onap.org:10003/}onap/cps-and-ncmp:${STABLE_CPS_CORE_VERSION:-latest} ports: - "8083:8080" - "8087:8081" |