X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docker-compose%2Fsdnc%2Fdocker-compose.yml;h=3661db9e6579d1e2d922145893f9bf01dea79334;hb=b42ff0c48e0f49eda7dba543160077d2c19e6c14;hp=edbe0bcfb9a84aef21ac2b2400c1f59706d301b0;hpb=e1733049102a58f17367b073f3abeaf5035d0c22;p=nonrtric.git

diff --git a/docker-compose/sdnc/docker-compose.yml b/docker-compose/sdnc/docker-compose.yml
index edbe0bcf..3661db9e 100644
--- a/docker-compose/sdnc/docker-compose.yml
+++ b/docker-compose/sdnc/docker-compose.yml
@@ -13,56 +13,14 @@
 #  limitations under the License.
 #  ============LICENSE_END=================================================
 #
-version: '3.0'
-services:
-  policy-agent:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:1.0.0
-    container_name: policy-agent
-    networks:
-      default:
-        aliases:
-          - policy-agent-container
-    ports:
-      - 8081:8081
-      - 8433:8433
-    volumes:
-      - ./config:/opt/app/policy-agent/config:ro
+version: '3.5'
 
-  a1-sim-OSC:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:1.0.1
-    container_name: a1-sim-OSC
-    networks:
-      - default
-    ports:
-      - 30001:8085
-      - 30002:8185
-    environment:
-      - A1_VERSION=OSC_2.1.0
-      - REMOTE_HOSTS_LOGGING=1
-      - ALLOW_HTTP=true
-
-  a1-sim-STD:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:1.0.1
-    container_name: a1-sim-STD
-    networks:
-      - default
-    ports:
-      - 30003:8085
-      - 30004:8185
-    environment:
-      - A1_VERSION=STD_1.1.3
-      - REMOTE_HOSTS_LOGGING=1
-      - ALLOW_HTTP=true
-
-  policy-control-panel:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:1.0.0
-    container_name: policy-control-panel
-    networks:
-      - default
-    ports:
-      - 8080:8080
-      - 8082:8082
+networks:
+  default:
+    driver: bridge
+    name: nonrtric-docker-net
 
+services:
   db:
     image: mysql/mysql-server:5.6
     container_name: sdnc-db
@@ -80,7 +38,7 @@ services:
         max-file: "5"
 
   a1-controller:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-a1-controller:1.7.5
+    image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-a1-controller:2.0.1
     depends_on :
       - db
     container_name: a1-controller
@@ -97,6 +55,12 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+    # For using own certs instead of the default ones (built into the container),
+    # place them in config/ directory, update the https-props-a1controller.properties file, and uncomment the following lines
+    #volumes:
+    #  - ./sdnc/config/keystore-a1controller.jks:/etc/ssl/certs/java/keystore.jks:ro
+    #  - ./sdnc/config/truststore-a1controller.jks:/etc/ssl/certs/java/truststore.jks:ro
+    #  - ./sdnc/config/https-props-a1controller.properties:/opt/onap/sdnc/data/properties/https-props.properties:ro
     logging:
       driver:   "json-file"
       options: