fix odl patches

[ccsdk/distribution.git] / src / main / yaml / docker-compose.yml

diff --git a/src/main/yaml/docker-compose.yml b/src/main/yaml/docker-compose.yml
index 4e0be9e..ffe7c7c 100644 (file)
--- a/src/main/yaml/docker-compose.yml
+++ b/src/main/yaml/docker-compose.yml
@@ -1,13 +1,13 @@
-version: '2'
+version: '2.1'
 
 services:
   db:
-    image: mysql/mysql-server:5.6
+    image: mariadb:10.5
     container_name: ccsdk_db_container
     ports:
       - "3306"
     environment:
-      - MYSQL_ROOT_PASSWORD=openECOMP1.0
+      - MYSQL_ROOT_PASSWORD=MySecretPassword
       - MYSQL_ROOT_HOST=%
     logging:       
       driver:   "json-file"
@@ -16,27 +16,12 @@ services:
         max-file: "5"
   
       
-  bareodl:
-    image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odl-image:0.2-STAGING-latest
-    container_name: ccsdk_bareodl_container
-    entrypoint: ["/opt/opendaylight/current/bin/karaf"]
-    ports:
-      - "18181:8181"
-    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"
-  
   odlsli:
-    image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odlsli-image:0.2-STAGING-latest
+    image: ${NEXUS_DOCKER_REPO}onap/ccsdk-odlsli-alpine-image:${CCSDK_DOCKER_IMAGE_VERSION}
     depends_on :
       - db
     container_name: ccsdk_odlsli_container
-    entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
+    entrypoint: ["/opt/onap/ccsdk/bin/startODL.sh"]
     ports:
       - "8383:8181"
     links:
@@ -44,8 +29,10 @@ services:
       - db:sdnctldb01
       - db:sdnctldb02
     environment:
-      - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+      - MYSQL_ROOT_PASSWORD=MySecretPassword
+      - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
+      - JAVA_OPTS=-Xms512m -Xmx2048m
+      - KARAF_CONSOLE_LOG_LEVEL=info
     logging:       
       driver:   "json-file"
       options:  
@@ -53,14 +40,14 @@ services:
         max-file: "5"
   
   dgbuilder:
-    image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-dgbuilder-image:0.2-STAGING-latest
+    image: ${NEXUS_DOCKER_REPO}onap/ccsdk-dgbuilder-image:${CCSDK_DOCKER_IMAGE_VERSION}
     depends_on:
       - db
     container_name:  ccsdk_dgbuilder_container
     entrypoint:
        - "/bin/bash"
        - "-c"
-       - "cd /opt/onap/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait"
+       - "cd /opt/onap/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait"
     ports:
       - "3000:3100"
     links:
@@ -69,8 +56,8 @@ services:
       - db:sdnctldb02
       - odlsli:sdnhost
     environment:
-      - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+      - MYSQL_ROOT_PASSWORD=MySecretPassword
+      - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
     logging:       
       driver:   "json-file"
       options: