From 7a8963cc00090a814d871e6df791516f94a7b745 Mon Sep 17 00:00:00 2001 From: ecaiyanlinux Date: Fri, 27 Aug 2021 14:27:30 +0200 Subject: [PATCH] Improve nonrtric docker-compose deployment Use env variables to replace hardcoded image urls & tags Signed-off-by: ecaiyanlinux Issue-ID: NONRTRIC-575 Change-Id: I6ee2f7a960b39ba841e5ef20f983aa34e444a194 --- solution/integration/smo/non-rt-ric/.env | 56 ++++++++++++++++++++++ .../integration/smo/non-rt-ric/docker-compose.yml | 24 +++++----- 2 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 solution/integration/smo/non-rt-ric/.env diff --git a/solution/integration/smo/non-rt-ric/.env b/solution/integration/smo/non-rt-ric/.env new file mode 100644 index 0000000..0223a4c --- /dev/null +++ b/solution/integration/smo/non-rt-ric/.env @@ -0,0 +1,56 @@ +# ============LICENSE_START=============================================== +# Copyright (C) 2021 Nordix Foundation. All rights reserved. +# ======================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END================================================= +# + +#PMS +PMS_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-policy-agent" +PMS_IMAGE_TAG="2.2.0" + +#A1_SIM +A1_SIM_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator" +A1_SIM_IMAGE_TAG="2.1.0" + +#RAPP +RAPP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-r-app-catalogue" +RAPP_IMAGE_TAG="1.0.0" + +#CONTROL_PANEL +CONTROL_PANEL_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-controlpanel" +CONTROL_PANEL_IMAGE_TAG="2.2.0" + +#GATEWAY +NONRTRIC_GATEWAY_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-gateway" +NONRTRIC_GATEWAY_IMAGE_TAG="1.0.0" + +#ECS +ECS_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-enrichment-coordinator-service" +ECS_IMAGE_TAG="1.1.0" + +#PRODUCER +PRODUCER_IMAGE_BASE="eexit/mirror-http-server" +PRODUCER_IMAGE_TAG="latest" + +#ORU +ORU_APP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-o-ru-closed-loop-recovery" +ORU_APP_IMAGE_TAG="1.0.0" + +#DB +DB_IMAGE_BASE="mysql/mysql-server" +DB_IMAGE_TAG="5.6" + +#A1CONTROLLER +A1CONTROLLER_IMAGE_BASE="nexus3.onap.org:10002/onap/sdnc-image" +A1CONTROLLER_IMAGE_TAG="2.1.2" \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/docker-compose.yml b/solution/integration/smo/non-rt-ric/docker-compose.yml index c204740..ef7b9d0 100644 --- a/solution/integration/smo/non-rt-ric/docker-compose.yml +++ b/solution/integration/smo/non-rt-ric/docker-compose.yml @@ -25,7 +25,7 @@ networks: services: policy-agent: - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-policy-agent:2.2.0 + image: "${PMS_IMAGE_BASE}:${PMS_IMAGE_TAG}" container_name: policy-agent networks: - default @@ -43,7 +43,7 @@ services: # - ./config/pms/application-policyagent.yaml:/opt/app/policy-agent/config/application.yaml:ro a1-sim-OSC: - image: nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator:2.1.0 + image: "${A1_SIM_IMAGE_BASE}:${A1_SIM_IMAGE_TAG}" container_name: a1-sim-OSC networks: - default @@ -58,7 +58,7 @@ services: - ALLOW_HTTP=true a1-sim-STD: - image: nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator:2.1.0 + image: "${A1_SIM_IMAGE_BASE}:${A1_SIM_IMAGE_TAG}" container_name: a1-sim-STD networks: - default @@ -73,7 +73,7 @@ services: - ALLOW_HTTP=true a1-sim-STD-v2: - image: nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator:2.1.0 + image: "${A1_SIM_IMAGE_BASE}:${A1_SIM_IMAGE_TAG}" container_name: a1-sim-STD-v2 networks: - default @@ -88,7 +88,7 @@ services: - ALLOW_HTTP=true r-app: - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-r-app-catalogue:1.1.0 + image: "${RAPP_IMAGE_BASE}:${RAPP_IMAGE_TAG}" container_name: r-app networks: - default @@ -97,7 +97,7 @@ services: - 8633:8633 policy-control-panel: - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-controlpanel:2.2.0 + image: "${CONTROL_PANEL_IMAGE_BASE}:${CONTROL_PANEL_IMAGE_TAG}" container_name: policy-control-panel networks: - default @@ -108,7 +108,7 @@ services: - ./config/control-panel/nginx.conf:/etc/nginx/nginx.conf:ro nonrtric-gateway: - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-gateway:1.0.0 + image: "${NONRTRIC_GATEWAY_IMAGE_BASE}:${NONRTRIC_GATEWAY_IMAGE_TAG}" container_name: nonrtric-gateway networks: - default @@ -118,7 +118,7 @@ services: - ./config/nonrtric-gateway/application-nonrtricgateway.yaml:/opt/app/nonrtric-gateway/config/application.yaml:ro ecs: - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-enrichment-coordinator-service:1.1.0 + image: "${ECS_IMAGE_BASE}:${ECS_IMAGE_TAG}" container_name: ecs networks: - default @@ -127,7 +127,7 @@ services: - 8434:8434 producer: - image: eexit/mirror-http-server + image: "${PRODUCER_IMAGE_BASE}:${PRODUCER_IMAGE_TAG}" container_name: producer networks: - default @@ -135,7 +135,7 @@ services: - 8088:80 oru-app: - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-o-ru-closed-loop-recovery:1.0.0 + image: "${ORU_APP_IMAGE_BASE}:${ORU_APP_IMAGE_TAG}" container_name: oru-app networks: - default @@ -151,7 +151,7 @@ services: - ./config/oru-app/o-ru-to-o-du-map.txt:/usr/src/app/o-ru-to-o-du-map.txt:ro db: - image: mysql/mysql-server:5.6 + image: "${DB_IMAGE_BASE}:${DB_IMAGE_TAG}" container_name: sdncdb networks: - default @@ -170,7 +170,7 @@ services: max-file: "5" a1controller: - image: nexus3.onap.org:10002/onap/sdnc-image:2.1.2 + image: "${A1CONTROLLER_IMAGE_BASE}:${A1CONTROLLER_IMAGE_TAG}" depends_on : - db container_name: a1controller -- 2.16.6