X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=near-rt-ric-simulator%2Fsimulator-group%2Fconsul_cbs%2Fdocker-compose.yml;h=15d3de1497d6040e004401d1bcb2908cdef5b860;hb=refs%2Fchanges%2F70%2F3270%2F2;hp=2464b0ec0f9e6fee2c5b6da54f82cee0e579aebb;hpb=9a84f51f7cc05cd21b680f5970c6545c0ca90bf1;p=nonrtric.git

diff --git a/near-rt-ric-simulator/simulator-group/consul_cbs/docker-compose.yml b/near-rt-ric-simulator/simulator-group/consul_cbs/docker-compose.yml
index 2464b0ec..15d3de14 100644
--- a/near-rt-ric-simulator/simulator-group/consul_cbs/docker-compose.yml
+++ b/near-rt-ric-simulator/simulator-group/consul_cbs/docker-compose.yml
@@ -1,27 +1,48 @@
+#  ============LICENSE_START===============================================
+#  Copyright (C) 2020 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=================================================
+#
+
+version: '3'
+
 networks:
-  nonrtric-docker-net:
+  default:
     external:
-      name: nonrtric-docker-net
+      name: ${DOCKER_SIM_NWNAME}
+
 services:
-  config-binding-service:
-    container_name: polman_cbs
-    depends_on:
-    - consul-server
-    environment:
-      CONSUL_HOST: consul-server
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.3.0
-    networks:
-      nonrtric-docker-net: null
-    ports:
-    - 10000:10000/tcp
+
   consul-server:
-    container_name: polman_consul
-    image: docker.io/consul:1.4.4
     networks:
-      nonrtric-docker-net: null
+      - default
+    container_name: ${CONSUL_APP_NAME}
+    image: ${CONSUL_IMAGE}
     ports:
-    - 8500:8500/tcp
+      - ${CONSUL_EXTERNAL_PORT}:${CONSUL_INTERNAL_PORT}
     volumes:
-    - /Users/yonwu/ORAN/nonrtric/near-rt-ric-simulator/simulator-group/consul_cbs/consul:/consul/config:rw
-version: '3.0'
+      - ./consul/:/consul/config
+
+  config-binding-service:
+    networks:
+      - default
+    container_name: ${CBS_APP_NAME}
+    image: ${CBS_IMAGE}
+    ports:
+      - ${CBS_EXTERNAL_PORT}:${CBS_INTERNAL_PORT}
+    environment:
+      - CONSUL_HOST=${CONSUL_HOST}
+    depends_on:
+      - ${CONSUL_HOST}