X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker-compose-app.yml;h=67cacf05470c6f75f242cd80d78cb65d97a89796;hb=fb417886112d22b8261de37c5eb2a030d6b4c1db;hp=68bcf2b914fc9da6707589f515d82f5bc4e2cc19;hpb=8415da7b2cfd499b4791999bc7632ef68be95d40;p=aai%2Ftest-config.git diff --git a/docker-compose-app.yml b/docker-compose-app.yml index 68bcf2b..67cacf0 100644 --- a/docker-compose-app.yml +++ b/docker-compose-app.yml @@ -1,36 +1,61 @@ 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} + - LOCAL_GROUP_ID=${GROUP_ID} ports: - 8447:8447 volumes: - ${RESOURCES_LOGS}:/opt/aai/logroot/AAI-RES + - /opt/test-config/aai-resources/appconfig/janusgraph-realtime.properties:/opt/app/aai-resources/resources/etc/appprops/janusgraph-realtime.properties + - /opt/test-config/aai-resources/appconfig/janusgraph-cached.properties:/opt/app/aai-resources/resources/etc/appprops/janusgraph-cached.properties + - /opt/test-config/aai-resources/appconfig/aaiconfig.properties:/opt/app/aai-resources/resources/etc/appprops/aaiconfig.properties + - /opt/test-config/aai-resources/appconfig/application.properties:/opt/app/aai-resources/resources/application.properties + - /opt/test-config/aai-resources/appconfig/logback.xml:/opt/app/aai-resources/resources/logback.xml + - /opt/test-config/aai-resources/appconfig/localhost-access-logback.xml:/opt/app/aai-resources/resources/localhost-access-logback.xml + - /opt/test-config/aai-resources/appconfig/aai_keystore:/opt/app/aai-resources/resources/etc/auth/aai_keystore + - /opt/test-config/aai-resources/appconfig/realm.properties:/opt/app/aai-resources/resources/etc/auth/realm.properties + - /opt/test-config/aai-schema/:/opt/app/aai-resources/resources/schema/ + - /opt/test-config/aai-resources/appconfig/aaf/cadi.properties:/opt/app/aai-resources/resources/cadi.properties + - /opt/test-config/aai-resources/appconfig/aaf/org.onap.aai.keyfile:/opt/app/aai-resources/resources/aaf/org.onap.aai.keyfile + - /opt/test-config/aai-resources/appconfig/aaf/org.onap.aai.p12:/opt/app/aai-resources/resources/aaf/org.onap.aai.p12 + - /opt/test-config/aai-resources/appconfig/aaf/org.onap.aai.props:/opt/app/aai-resources/resources/aaf/org.onap.aai.props + - /opt/test-config/aai-resources/appconfig/aaf/org.osaaf.location.props:/opt/app/aai-resources/resources/aaf/org.osaaf.location.props + - /opt/test-config/aai-resources/appconfig/aaf/permissions.properties:/opt/app/aai-resources/resources/aaf/permissions.properties + - /opt/test-config/aai-resources/appconfig/aaf/truststoreONAPall.jks:/opt/app/aai-resources/resources/aaf/truststoreONAPall.jks logging: driver: "json-file" 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} + - LOCAL_GROUP_ID=${GROUP_ID} + - DISABLE_UPDATE_QUERY=true volumes: - ${TRAVERSAL_LOGS}:/opt/aai/logroot/AAI-GQ + - /opt/test-config/aai-traversal/appconfig/janusgraph-realtime.properties:/opt/app/aai-traversal/resources/etc/appprops/janusgraph-realtime.properties + - /opt/test-config/aai-traversal/appconfig/janusgraph-cached.properties:/opt/app/aai-traversal/resources/etc/appprops/janusgraph-cached.properties + - /opt/test-config/aai-traversal/appconfig/aaiconfig.properties:/opt/app/aai-traversal/resources/etc/appprops/aaiconfig.properties + - /opt/test-config/aai-traversal/appconfig/application.properties:/opt/app/aai-traversal/resources/application.properties + - /opt/test-config/aai-traversal/appconfig/logback.xml:/opt/app/aai-traversal/resources/logback.xml + - /opt/test-config/aai-traversal/appconfig/localhost-access-logback.xml:/opt/app/aai-traversal/resources/localhost-access-logback.xml + - /opt/test-config/aai-traversal/appconfig/aai_keystore:/opt/app/aai-traversal/resources/etc/auth/aai_keystore + - /opt/test-config/aai-traversal/appconfig/realm.properties:/opt/app/aai-traversal/resources/etc/auth/realm.properties + - /opt/test-config/aai-schema/:/opt/app/aai-resources/resources/schema/ + - /opt/test-config/aai-traversal/appconfig/aaf/cadi.properties:/opt/app/aai-traversal/resources/cadi.properties + - /opt/test-config/aai-traversal/appconfig/aaf/org.onap.aai.keyfile:/opt/app/aai-traversal/resources/aaf/org.onap.aai.keyfile + - /opt/test-config/aai-traversal/appconfig/aaf/org.onap.aai.p12:/opt/app/aai-traversal/resources/aaf/org.onap.aai.p12 + - /opt/test-config/aai-traversal/appconfig/aaf/org.onap.aai.props:/opt/app/aai-traversal/resources/aaf/org.onap.aai.props + - /opt/test-config/aai-traversal/appconfig/aaf/org.osaaf.location.props:/opt/app/aai-traversal/resources/aaf/org.osaaf.location.props + - /opt/test-config/aai-traversal/appconfig/aaf/permissions.properties:/opt/app/aai-traversal/resources/aaf/permissions.properties + - /opt/test-config/aai-traversal/appconfig/aaf/truststoreONAPall.jks:/opt/app/aai-traversal/resources/aaf/truststoreONAPall.jks ports: - 8446:8446 logging: @@ -38,16 +63,42 @@ services: options: max-size: "30m" max-file: "5" - aai.api.simpledemo.openecomp.org: - image: ${AAI_HAPROXY_IMAGE} - hostname: aai.api.simpledemo.openecomp.org + aai-graphadmin.api.simpledemo.onap.org: + image: ${DOCKER_REGISTRY}/onap/aai-graphadmin + hostname: aai-graphadmin.api.simpledemo.onap.org + environment: + - LOCAL_USER_ID=${USER_ID} + - LOCAL_GROUP_ID=${GROUP_ID} + volumes: + - ${GRAPHADMIN_LOGS}:/opt/aai/logroot/AAI-GA + - /opt/test-config/aai-graphadmin/appconfig/janusgraph-realtime.properties:/opt/app/aai-graphadmin/resources/etc/appprops/janusgraph-realtime.properties + - /opt/test-config/aai-graphadmin/appconfig/janusgraph-cached.properties:/opt/app/aai-graphadmin/resources/etc/appprops/janusgraph-cached.properties + - /opt/test-config/aai-graphadmin/appconfig/aaiconfig.properties:/opt/app/aai-graphadmin/resources/etc/appprops/aaiconfig.properties + - /opt/test-config/aai-graphadmin/appconfig/application.properties:/opt/app/aai-graphadmin/resources/application.properties + - /opt/test-config/aai-graphadmin/appconfig/logback.xml:/opt/app/aai-graphadmin/resources/logback.xml + - /opt/test-config/aai-graphadmin/appconfig/localhost-access-logback.xml:/opt/app/aai-graphadmin/resources/localhost-access-logback.xml + - /opt/test-config/aai-graphadmin/appconfig/aai_keystore:/opt/app/aai-graphadmin/resources/etc/auth/aai_keystore + - /opt/test-config/aai-graphadmin/appconfig/realm.properties:/opt/app/aai-graphadmin/resources/etc/auth/realm.properties + - /opt/test-config/aai-schema/:/opt/app/aai-resources/resources/schema/ + ports: + - 8449:8449 + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + 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 + - /opt/test-config/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg + - /opt/test-config/haproxy/aai.pem:/etc/ssl/private/aai.pem logging: driver: "json-file" options: @@ -55,7 +106,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 @@ -73,7 +124,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 @@ -94,7 +145,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 @@ -108,7 +159,7 @@ services: max-file: "5" sparky-be: - image: ${DOCKER_REGISTRY}/openecomp/sparky-be + image: ${DOCKER_REGISTRY}/onap/sparky-be hostname: sparky-be volumes: - ${UI_LOGS}:/logs @@ -116,15 +167,107 @@ services: ports: - 9517:9517 environment: - - CONFIG_HOME=/opt/app/sparky/config - - KEY_STORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o - - KEY_MANAGER_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o + - KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 + - KEYSTORE_ALIAS_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 + - SPARKY_SSL_ENABLED=false + - SPARKY_PORTAL_ENABLED=true + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + + champ-service: + image: ${DOCKER_REGISTRY}/onap/champ + hostname: champ-service + volumes: + - ${CHAMP_LOGS}:/logs + - /opt/test-config/champ-service/logging/logback.xml:/opt/app/champ-service/bundleconfig/etc/logback.xml + - /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=janus-deps + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + + crud-service: + image: ${DOCKER_REGISTRY}/onap/gizmo + hostname: crud-service + volumes: + - ${CRUD_LOGS}:/logs + - /opt/test-config/crud-service/appconfig:/opt/app/crud-service/config + - /opt/test-config/crud-service/dynamic:/opt/app/crud-service/dynamic + ports: + - 9520:9520 + environment: + - CONFIG_HOME=/opt/app/crud-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/crud-service/dynamic/conf logging: driver: "json-file" options: max-size: "30m" max-file: "5" + spike-service: + image: ${DOCKER_REGISTRY}/onap/spike + hostname: spike-service + volumes: + - ${SPIKE_LOGS}:/logs + - /opt/test-config/spike-service/appconfig:/opt/app/spike-service/config + - /opt/test-config/spike-service/dynamic:/opt/app/spike-service/dynamic + ports: + - 9518:9518 + environment: + - CONFIG_HOME=/opt/app/spike-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/spike-service/dynamic/conf + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + + babel: + image: ${DOCKER_REGISTRY}/onap/babel + hostname: babel + volumes: + - ${BABEL_LOGS}:/opt/app/babel/logs/AAI-BAS + - /opt/test-config/babel/appconfig:/opt/app/babel/config + ports: + - 9516:9516 + environment: + - CONFIG_HOME=/opt/app/babel/config/ + - KEY_STORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 + - KEY_MANAGER_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" networks: default: driver: bridge