move non-root id run for CDT container

[appc/deployment.git] / docker-compose / docker-compose.yml

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index b82eaaf..809bc57 100644 (file)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -27,7 +27,7 @@ networks:
 
 services:
   db:
-    image: mysql/mysql-server:5.6
+    image: mariadb:10.1.11
     container_name: sdnc_db_container
     ports:
       - "3306"
@@ -40,6 +40,27 @@ services:
         max-size: "30m"
         max-file: "5"
 
+  ansible:
+    image: onap/ccsdk-ansible-server-image:latest
+    depends_on :
+      - db
+    container_name: appc_ansible_container
+    entrypoint: ["/opt/onap/ccsdk/startAnsibleServer.sh"]
+    ports:
+      - "8000"
+    links:
+      - db:dbhost
+      - db:sdnctldb01
+      - db:sdnctldb02
+    environment:
+      - MYSQL_ROOT_PASSWORD=openECOMP1.0
+    logging:
+      driver:   "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+
+
 # Tweaking SDNC_CONFIG_DIR temporarily from ../sdnc/.. to ../appc/.. since it may be needed in this script
 #    to map to SDN-C AAI Service Bundle's AAI Activator class inside the gerrit sdnc/adaptors repo, so that
 #    the AAI Service bundle loads APP-C's aaiclient.properties instead of SDN-C's aaiclient.properties.
@@ -47,15 +68,19 @@ services:
     image: "onap/appc-image:latest"
     depends_on :
       - db
+      - ansible
     container_name: appc_controller_container
     entrypoint: ["/opt/onap/appc/bin/startODL.sh"]
     ports:
       - "8282:8181"
       - "1830:1830"
+      - "9090:9191"
+      - "30290:9191"
     links:
       - db:dbhost
       - db:sdnctldb01
       - db:sdnctldb02
+      - ansible:ansiblehost
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - SDNC_CONFIG_DIR=/opt/onap/appc/data/properties
@@ -99,15 +124,14 @@ services:
       - db
     container_name: appc_cdt_container
     entrypoint:
-       - "/bin/bash"
-       - "-c"
-       - "cd /usr/local/apache2/ && /usr/local/apache2/bin/httpd -D FOREGROUND && wait"
+       - "/opt/startCdt.sh"
     ports:
-      - "8080:80"
+      - "8080:18080"
     links:
       - appc:sdnhost
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
+      - CDT_PORT=9090
     logging:
       driver: "json-file"
       options: