X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsrc%2Fmain%2Fyaml%2Fdocker-compose.yml;h=7adc62023c0e71f88b76aab8b47c283aa972628c;hb=e7380bdf449888bafa996f8a8d349ce7d3c8a731;hp=4e0de9b97f8d46156b8e0ef0604d00d27acd6619;hpb=67710454be20dbff2330dde919f837d850ed50ed;p=sdnc%2Foam.git

diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index 4e0de9b9..7adc6202 100644
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -59,6 +59,17 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+      - SDNC_BIN=/opt/onap/sdnc/bin
+      - ODL_CERT_DIR=/tmp
+      - ODL_ADMIN_USERNAME=admin
+      - ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+      - SDNC_DB_INIT=true  
+      - A1_TRUSTSTORE_PASSWORD=a1adapter
+    # The default truststore for A1 adapter can be overridden by mounting a new
+    # truststore (uncomment the lines below), whereas the corresponding password
+    # should be updated in A1_TRUSTSTORE_PASSWORD environment variable (in the line above)
+    #volumes:
+    #  - ./a1_truststore.jks:/opt/onap/sdnc/data/stores/truststore.a1.adapter.jks:ro
     dns:
       - ${DNS_IP_ADDR-10.0.100.1}
     logging:
@@ -69,35 +80,6 @@ services:
     extra_hosts:
         aaf.osaaf.org: 10.12.6.214
 
-
-  web:
-    image: onap/admportal-sdnc-image:latest
-    depends_on:
-      - db
-    container_name: sdnc_portal_container
-    entrypoint:
-       - "/bin/bash"
-       - "-c"
-       - "cd /opt/onap/sdnc/admportal/shell && ./start_portal.sh"
-    ports:
-      - "8843:8843"
-      - "8443:8443"
-    links:
-      - db:dbhost
-      - db:sdnctldb01
-      - db:sdnctldb02
-      - sdnc:sdnhost
-    environment:
-      - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
-      - CERT_PSWD=onap3.0
-    logging:
-      driver:   "json-file"
-      options:
-        max-size: "30m"
-        max-file: "5"
-
-
   dgbuilder:
     image: onap/ccsdk-dgbuilder-image:latest
     depends_on: