X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=blobdiff_plain;f=installation%2Fsrc%2Fmain%2Fyaml%2Fdocker-compose.yml;h=f4cf673d318124bd7885e7339968fa0758d8db28;hp=12ca37bbae26c3cc93b41d26992904ead16537b9;hb=refs%2Fheads%2Fmaster;hpb=b50f3b91a0f24bc9468825c7ffbd0ea8c2630868

diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index 12ca37bb..f4cf673d 100644
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -8,14 +8,18 @@ networks:
 
 
 services:
+
   db:
-    image: mysql/mysql-server:5.6
+    image: mariadb:10.5
     container_name: sdnc_db_container
     ports:
-      - "3306"
+      - "23306:3306"
     environment:
-      - MYSQL_ROOT_PASSWORD=openECOMP1.0
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - MYSQL_ROOT_HOST=%
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
     logging:
       driver:   "json-file"
       options:
@@ -27,7 +31,7 @@ services:
     depends_on :
       - db
     container_name: sdnc_ansible_container
-    entrypoint: ["/opt/onap/ccsdk/startAnsibleServer.sh"]
+    entrypoint: ["/opt/ansible-server/startAnsibleServer.sh"]
     ports:
       - "8000"
     links:
@@ -35,7 +39,11 @@ services:
       - db:sdnctldb01
       - db:sdnctldb02
     environment:
-      - MYSQL_ROOT_PASSWORD=openECOMP1.0
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+      - ANSIBLE_TRUSTSTORE_PASSWORD=${ANSIBLE_TRUSTSTORE_PASSWORD}
     logging:
       driver:   "json-file"
       options:
@@ -47,7 +55,7 @@ services:
     depends_on :
       - db
       - ansible
-    container_name: sdnc_controller_container
+    container_name: sdnc_controller
     entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
     ports:
       - "8282:8181"
@@ -57,8 +65,37 @@ services:
       - db:sdnctldb02
       - ansible:ansiblehost
     environment:
-      - MYSQL_ROOT_PASSWORD=openECOMP1.0
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+      - SDNC_BIN=/opt/onap/sdnc/bin
+      - ODL_CERT_DIR=/tmp
+      - ODL_ADMIN_USERNAME=${ODL_USER}
+      - ODL_ADMIN_PASSWORD=${ODL_PASSWORD}
+      - ODL_USER=${ODL_USER}
+      - ODL_PASSWORD=${ODL_PASSWORD}
+      - SDNC_DB_INIT=true
+      - HONEYCOMB_USER=${HONEYCOMB_USER}
+      - HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD}
+      - TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD}
+      - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD}
+      - SO_USER=${SO_USER}
+      - SO_PASSWORD=${SO_PASSWORD}
+      - NENG_USER=${NENG_USER}
+      - NENG_PASSWORD=${NENG_PASSWORD}
+      - CDS_USER=${CDS_USER}
+      - CDS_PASSWORD=${CDS_PASSWORD}
+      - ANSIBLE_USER=${ANSIBLE_USER}
+      - ANSIBLE_PASSWORD=${ANSIBLE_PASSWORD}
+      - SQL_CRYPTKEY=${SQL_CRYPTKEY}
+      - 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,38 +106,11 @@ 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"
-    links:
-      - db:dbhost
-      - db:sdnctldb01
-      - db:sdnctldb02
-      - sdnc:sdnhost
-    environment:
-      - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
-    logging:
-      driver:   "json-file"
-      options:
-        max-size: "30m"
-        max-file: "5"
-
-
   dgbuilder:
     image: onap/ccsdk-dgbuilder-image:latest
     depends_on:
       - db
-    container_name:  sdnc_dgbuilder_container
+    container_name: sdnc_dgbuilder_container
     entrypoint:
        - "/bin/bash"
        - "-c"
@@ -113,7 +123,10 @@ services:
       - db:sdnctldb02
       - sdnc:sdnhost
     environment:
-      - MYSQL_ROOT_PASSWORD=openECOMP1.0
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
       - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
     logging:
       driver:   "json-file"
@@ -125,7 +138,7 @@ services:
     image: onap/sdnc-ueb-listener-image:latest
     depends_on:
       - db
-    container_name:  sdnc_ueblistener_container
+    container_name: sdnc_ueblistener_container
     entrypoint: ["/opt/onap/sdnc/ueb-listener/bin/start-ueb-listener.sh" ]
     links:
       - db:dbhost
@@ -135,6 +148,13 @@ services:
     environment:
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
       - PROPERTY_DIR=/opt/onap/sdnc/data/properties
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+      - ODL_USER=${ODL_USER}
+      - ODL_PASSWORD=${ODL_PASSWORD}
+      - ASDC_USER=${ASDC_USER}
+      - ASDC_PASSWORD=${ASDC_PASSWORD}
     logging:
       driver:   "json-file"
       options:
@@ -145,7 +165,7 @@ services:
     image: onap/sdnc-dmaap-listener-image:latest
     depends_on:
       - db
-    container_name:  sdnc_dmaaplistener_container
+    container_name: sdnc_dmaaplistener_container
     entrypoint: ["/opt/onap/sdnc/dmaap-listener/bin/start-dmaap-listener.sh" ]
     links:
       - db:dbhost
@@ -155,6 +175,14 @@ services:
     environment:
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
       - PROPERTY_DIR=/opt/onap/sdnc/data/properties
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+      - ODL_USER=${ODL_USER}
+      - ODL_PASSWORD=${ODL_PASSWORD}
+      - DMAAP_USER=${DMAAP_USER}
+      - DMAAP_PASSWORD=${DMAAP_PASSWORD}
+      - DMAAP_AUTHKEY=${DMAAP_AUTHKEY}
     logging:
       driver:   "json-file"
       options: