X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=solution%2Fintegration%2Fsmo%2Fnon-rt-ric%2Fdocker-compose.yml;h=654bf937e0a5189189853f95b67f9f16b6494792;hb=3db774c24c7a57e168f3763f181f114f27c003ba;hp=cb45c45dac31a68c4c494c1fa2ac4ae15754e607;hpb=46e093518801f9ac974487f0c3440f1e4e56d5f4;p=oam.git

diff --git a/solution/integration/smo/non-rt-ric/docker-compose.yml b/solution/integration/smo/non-rt-ric/docker-compose.yml
index cb45c45..654bf93 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:10004/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:10004/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:10004/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:10004/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:10004/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:10004/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:10004/o-ran-sc/nonrtric-gateway:0.0.1
+    image: "${NONRTRIC_GATEWAY_IMAGE_BASE}:${NONRTRIC_GATEWAY_IMAGE_TAG}"
     container_name: nonrtric-gateway
     networks:
       - default
@@ -117,9 +117,9 @@ services:
     volumes:
       - ./config/nonrtric-gateway/application-nonrtricgateway.yaml:/opt/app/nonrtric-gateway/config/application.yaml:ro
 
-  ecs:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-enrichment-coordinator-service:1.1.0
-    container_name: ecs
+  ics:
+    image: "${ICS_IMAGE_BASE}:${ICS_IMAGE_TAG}"
+    container_name: ics
     networks:
       - default
     ports:
@@ -127,26 +127,15 @@ services:
       - 8434:8434
 
   producer:
-    image: eexit/mirror-http-server
+    image: "${PRODUCER_IMAGE_BASE}:${PRODUCER_IMAGE_TAG}"
     container_name: producer
     networks:
       - default
     ports:
       - 8088:80
 
-  message-generator:
-    image: quay.io/yanhuanwang/message-generator
-    container_name: message-generator
-    networks:
-      - default
-      - smo
-      - oam
-    environment:
-      - MR-HOST=http://onap-dmaap
-      - MR-PORT=3904
-
   oru-app:
-    image: nexus3.o-ran-sc.org:10004/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
@@ -158,9 +147,27 @@ services:
       - SDNR-HOST=http://sdnr
       - SDNR-PORT=8181
       - VERBOSE=on
+    volumes:
+      - ./config/oru-app/o-ru-to-o-du-map.txt:/usr/src/app/o-ru-to-o-du-map.txt:ro
+
+  odu-app:
+    image: "${ODU_APP_IMAGE_BASE}:${ODU_APP_IMAGE_TAG}"
+    container_name: odu-app
+    networks:
+      - default
+      - oam
+      - smo
+    environment:
+      - MR_HOST=http://onap-dmaap
+      - MR_PORT=3904
+      - SDNR_ADDRESS=http://sdnr:8181
+      - SDNR_USER=admin
+      - SDNR_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+      - LOG_LEVEL=Info
+      - POLLTIME=10
 
   db:
-    image: mysql/mysql-server:5.6
+    image: "${DB_IMAGE_BASE}:${DB_IMAGE_TAG}"
     container_name: sdncdb
     networks:
       - default
@@ -179,7 +186,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