Remove comment from champ-api.properties

[aai/test-config.git] / docker-compose-app.yml

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index f559945..912309f 100644 (file)
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -1,14 +1,15 @@
 version: '2'
 services:
-  aai-resources.api.simpledemo.openecomp.org:
-    image: ${DOCKER_REGISTRY}/openecomp/aai-resources
-    hostname: aai-resources.api.simpledemo.openecomp.org
+  aai-resources.api.simpledemo.onap.org:
+    image: ${DOCKER_REGISTRY}/onap/aai-resources
+    hostname: aai-resources.api.simpledemo.onap.org
     environment:
       - AAI_CHEF_ENV=simpledemo
       - AAI_CHEF_LOC=/var/chef/aai-data/environments
       - CHEF_BRANCH=master
       - CHEF_GIT_URL=http://gerrit.onap.org/r/aai
       - AAI_CORE_VERSION=1.1.0-SNAPSHOT
+      - LOCAL_USER_ID=${USER_ID}
     ports:
       - 8447:8447
     volumes:
@@ -18,15 +19,16 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-  aai-traversal.api.simpledemo.openecomp.org:
-    image: ${DOCKER_REGISTRY}/openecomp/aai-traversal
-    hostname: aai-traversal.api.simpledemo.openecomp.org
+  aai-traversal.api.simpledemo.onap.org:
+    image: ${DOCKER_REGISTRY}/onap/aai-traversal
+    hostname: aai-traversal.api.simpledemo.onap.org
     environment:
       - AAI_CHEF_ENV=simpledemo
       - AAI_CHEF_LOC=/var/chef/aai-data/environments
       - CHEF_BRANCH=master
       - CHEF_GIT_URL=http://gerrit.onap.org/r/aai
       - AAI_CORE_VERSION=1.1.0-SNAPSHOT
+      - LOCAL_USER_ID=${USER_ID}
     volumes:
       - ${TRAVERSAL_LOGS}:/opt/aai/logroot/AAI-GQ
     ports:
@@ -36,14 +38,14 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-  aai.api.simpledemo.openecomp.org:
-    image: ${AAI_HAPROXY_IMAGE}
-    hostname: aai.api.simpledemo.openecomp.org
+  aai.api.simpledemo.onap.org:
+    image: ${AAI_HAPROXY_IMAGE}:${AAI_HAPROXY_VERSION}
+    hostname: aai.api.simpledemo.onap.org
     ports:
       - 8443:8443
     links:
-      - aai-resources.api.simpledemo.openecomp.org
-      - aai-traversal.api.simpledemo.openecomp.org
+      - aai-resources.api.simpledemo.onap.org
+      - aai-traversal.api.simpledemo.onap.org
     volumes:
       - /dev/log:/dev/log
     logging:
@@ -53,7 +55,7 @@ services:
         max-file: "5"
 
   aai.searchservice.simpledemo.openecomp.org:
-    image: ${DOCKER_REGISTRY}/openecomp/search-data-service
+    image: ${DOCKER_REGISTRY}/onap/search-data-service
     hostname: aai.searchservice.simpledemo.openecomp.org
     volumes:
       - ${SEARCH_LOGS}:/logs
@@ -71,7 +73,7 @@ services:
         max-file: "5"
 
   datarouter:
-    image: ${DOCKER_REGISTRY}/openecomp/data-router
+    image: ${DOCKER_REGISTRY}/onap/data-router
     hostname: data-router
     volumes:
       - ${DATA_ROUTER_LOGS}:/logs
@@ -92,7 +94,7 @@ services:
         max-file: "5"
 
   model-loader:
-    image: ${DOCKER_REGISTRY}/openecomp/model-loader
+    image: ${DOCKER_REGISTRY}/onap/model-loader
     hostname: model-loader
     volumes:
       - ${MODEL_LOADER_LOGS}:/logs
@@ -105,12 +107,12 @@ services:
         max-size: "30m"
         max-file: "5"
 
-  aai.ui.simpledemo.openecomp.org:
-    image: ${DOCKER_REGISTRY}/openecomp/aai-ui
-    hostname: aai.ui.simpledemo.openecomp.org
+  sparky-be:
+    image: ${DOCKER_REGISTRY}/onap/sparky-be
+    hostname: sparky-be
     volumes:
       - ${UI_LOGS}:/logs
-      - /opt/app/sparky/appconfig:/opt/app/UI_LOGS/config
+      - /opt/test-config/sparky/appconfig:/opt/app/sparky/config
     ports:
       - 9517:9517
     environment:
@@ -122,7 +124,32 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-        
+
+  champ-service:
+    image: ${DOCKER_REGISTRY}/onap/champ-service
+    hostname: champ-service
+    volumes:
+      - ${CHAMP_LOGS}:/logs
+      - /opt/test-config/champ-service/appconfig:/opt/app/champ-service/config
+      - /opt/test-config/champ-service/dynamic:/opt/app/champ-service/dynamic
+    ports:
+      - 9522:9522
+    environment:
+      - CONFIG_HOME=/opt/app/champ-service/config/
+      - KEY_STORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - KEY_MANAGER_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - AJSC_JETTY_ThreadCount_MIN=5
+      - AJSC_JETTY_ThreadCount_MAX=200
+      - AJSC_JETTY_BLOCKING_QUEUE_SIZE=200
+      - MAX_HEAP=1024
+      - SERVICE_BEANS=/opt/app/champ-service/dynamic/conf
+      - GRAPHIMPL=titan-deps
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+
 networks:
   default:
       driver: bridge