Use env varialbes to replace image urls & tags

Change-Id: I52421a03ddfb88fbad95eef8755c4d8e9c376705
Signed-off-by: ecaiyanlinux <martin.c.yan@est.tech>
Issue-ID: NONRTRIC-560

diff --git a/docker-compose/.env b/docker-compose/.env
new file mode 100644 (file)
index 0000000..6fc3528
--- /dev/null
+++ b/docker-compose/.env
@@ -0,0 +1,64 @@
+#  ============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"
+
+#CONSUMER
+CONSUMER_IMAGE_BASE="eexit/mirror-http-server"
+CONSUMER_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"
+
+#DMAAP_MEDIATOR_GO
+DMAAP_MEDIATOR_GO_BASE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-dmaap-mediator-producer"
+DMAAP_MEDIATOR_GO_TAG="1.0,0"
+
+#DMAAP_MEDIATOR_JAVA
+DMAAP_MEDIATOR_JAVA_BASE="nexus3.o-ran-sc.org:10003/o-ran-sc/nonrtric-dmaap-adaptor"
+DMAAP_MEDIATOR_JAVA_TAG="1.0.0-SNAPSHOT"
\ No newline at end of file

diff --git a/docker-compose/a1-sim/docker-compose.yaml b/docker-compose/a1-sim/docker-compose.yaml
index 9366ff1..8467946 100644 (file)
--- a/docker-compose/a1-sim/docker-compose.yaml
+++ b/docker-compose/a1-sim/docker-compose.yaml
@@ -22,7 +22,7 @@ networks:
 
 services:
   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
@@ -35,7 +35,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
@@ -48,7 +48,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

diff --git a/docker-compose/dmaap-mediator-go/docker-compose.yaml b/docker-compose/dmaap-mediator-go/docker-compose.yaml
index 340d158..4efdf57 100644 (file)
--- a/docker-compose/dmaap-mediator-go/docker-compose.yaml
+++ b/docker-compose/dmaap-mediator-go/docker-compose.yaml
@@ -22,18 +22,15 @@ networks:
 
 services:
   dmaap-mediator-go:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-dmaap-mediator-producer:1.0.0
+    image: "${DMAAP_MEDIATOR_GO_BASE}:${DMAAP_MEDIATOR_GO_TAG}"
     container_name: dmaap-mediator-go
     environment:
       - INFO_PRODUCER_HOST=http://consumer
-      - LOG_LEVEL=Debug
       - INFO_PRODUCER_PORT=8088
       - INFO_COORD_ADDR=http://ecs:8083
-      - MR_HOST=http://dmaap-mr
-      - MR_PORT=3904
-      - INFO_PRODUCER_SUPERVISION_CALLBACK_HOST=http://consumer
-      - INFO_PRODUCER_SUPERVISION_CALLBACK_PORT=8088
-      - INFO_JOB_CALLBACK_HOST=http://consumer
-      - INFO_JOB_CALLBACK_PORT=8088
+      - DMAAP_MR_ADDR=http://dmaap-mr:3904
+      - PRODUCER_CERT_PATH=security/producer.crt
+      - PRODUCER_KEY_PATH=security/producer.key
+      - LOG_LEVEL=Debug
     networks:
       - default
\ No newline at end of file

diff --git a/docker-compose/dmaap-mediator-java/docker-compose.yaml b/docker-compose/dmaap-mediator-java/docker-compose.yaml
index 1d53de4..5cfe809 100644 (file)
--- a/docker-compose/dmaap-mediator-java/docker-compose.yaml
+++ b/docker-compose/dmaap-mediator-java/docker-compose.yaml
@@ -22,7 +22,7 @@ networks:
 
 services:
   dmaap-mediator-java:
-    image: nexus3.o-ran-sc.org:10003/o-ran-sc/nonrtric-dmaap-adaptor:1.0.0-SNAPSHOT
+    image: "${DMAAP_MEDIATOR_JAVA_BASE}:${DMAAP_MEDIATOR_JAVA_TAG}"
     container_name: dmaap-mediator-java
     networks:
       - default

diff --git a/docker-compose/ecs/docker-compose.yaml b/docker-compose/ecs/docker-compose.yaml
index 376f734..6de293f 100644 (file)
--- a/docker-compose/ecs/docker-compose.yaml
+++ b/docker-compose/ecs/docker-compose.yaml
@@ -22,7 +22,7 @@ networks:
 
 services:
   ecs:
-    image: nexus3.o-ran-sc.org:10003/o-ran-sc/nonrtric-enrichment-coordinator-service:1.2.0-SNAPSHOT
+    image: "${ECS_IMAGE_BASE}:${ECS_IMAGE_TAG}"
     container_name: ecs
     networks:
       default:
@@ -32,7 +32,7 @@ services:
       - 8083:8083
       - 8434:8434
   consumer:
-    image: eexit/mirror-http-server
+    image: "${CONSUMER_IMAGE_BASE}:${CONSUMER_IMAGE_TAG}"
     container_name: consumer
     networks:
       - default

diff --git a/docker-compose/policy-service/docker-compose.yaml b/docker-compose/policy-service/docker-compose.yaml
index a593e2e..2dfc38c 100644 (file)
--- a/docker-compose/policy-service/docker-compose.yaml
+++ b/docker-compose/policy-service/docker-compose.yaml
@@ -22,7 +22,7 @@ networks:
 
 services:
   policy-agent:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.3.0
+    image: "${PMS_IMAGE_BASE}:${PMS_IMAGE_TAG}"
     container_name: policy-agent
     networks:
       default:

diff --git a/docker-compose/rapp/docker-compose.yaml b/docker-compose/rapp/docker-compose.yaml
index ade37f7..5477588 100644 (file)
--- a/docker-compose/rapp/docker-compose.yaml
+++ b/docker-compose/rapp/docker-compose.yaml
@@ -22,7 +22,7 @@ networks:
 
 services:
   r-app:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-r-app-catalogue:1.1.0
+    image: "${RAPP_IMAGE_BASE}:${RAPP_IMAGE_TAG}"
     container_name: r-app
     networks:
       default: