X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fso%2Fintegration-etsi-testing%2Fdocker-compose.yml;h=2ee5026a625ca0cea01f0f8945b465ef20ec8203;hb=f626094eea291098de100cacbee8e069414b912c;hp=96eea965014f5a9112e43964b554f3421fa5f439;hpb=1f083f7f78f585c0c8129a2f4841509b8a277d2e;p=integration%2Fcsit.git

diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml
index 96eea965..2ee5026a 100644
--- a/plans/so/integration-etsi-testing/docker-compose.yml
+++ b/plans/so/integration-etsi-testing/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       - "8082:8082"
     volumes:
       - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
-      - ${TEST_LAB_DIR}/volumes/so/config/catalog-db-adapter/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/override-files/catalog-db-adapter/onapheat:/app/config
     environment:
       - APP=catalog-db-adapter
       - JVM_ARGS=-Xms64m -Xmx512m
@@ -43,14 +43,8 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /app/wait-for.sh
-      - -q
-      - -t
-      - "300"
-      - mariadb:3306
-      - --
-      - "/app/start-app.sh"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" mariadb:3306 -- "/app/start-app.sh"'
 ################################################################################
   request-db-adapter:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/request-db-adapter:${TAG}
@@ -78,14 +72,8 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /app/wait-for.sh
-      - -q
-      - -t
-      - "300"
-      - catalog-db-adapter:8082
-      - --
-      - "/app/start-app.sh"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" catalog-db-adapter:8082 -- "/app/start-app.sh"'
 ################################################################################
   sdnc-adapter:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdnc-adapter:${TAG}
@@ -114,14 +102,8 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /app/wait-for.sh
-      - -q
-      - -t
-      - "300"
-      - request-db-adapter:8083
-      - --
-      - "/app/start-app.sh"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 ################################################################################
   sdc-controller:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdc-controller:${TAG}
@@ -151,19 +133,17 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /bin/sh
-      - -c
-      - 'mkdir -p /distribution-test-zip/unzipped && tar -xvzf /distribution-test-zip/zipped_sdc_csar.tar.gz -C /distribution-test-zip/unzipped && /app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
+    user: root
+    entrypoint: /bin/sh -c 'mkdir -p /distribution-test-zip/unzipped && tar -xvzf /distribution-test-zip/zipped_sdc_csar.tar.gz -C /distribution-test-zip/unzipped && chmod 777 -R /distribution-test-zip/ && /app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 ################################################################################
   bpmn-infra:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/bpmn-infra:${TAG}
     ports:
       - "8081:8081"
     volumes:
-      - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ${CONFIG_DIR_PATH}/override-files/bpmn-infra/onapheat:/app/config
-      - ${CONFIG_DIR_PATH}/certificates/aai-certificate/aai.crt:/app/ca-certificates/aai.crt
+      - ${CONFIG_DIR_PATH}/certificates/bpmn-infra-certs:/app/bpmn-infra-certs
+      - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
     environment:
       - APP=bpmn-infra
       - JVM_ARGS=-Xms64m -Xmx512m
@@ -184,22 +164,16 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /app/wait-for.sh
-      - -q
-      - -t
-      - "300"
-      - request-db-adapter:8083
-      - --
-      - "/app/start-app.sh"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 ################################################################################
   api-handler-infra:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/api-handler-infra:${TAG}
     ports:
       - "8080:8080"
     volumes:
-      - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ${CONFIG_DIR_PATH}/override-files/api-handler-infra/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
     environment:
       - APP=api-handler-infra
       - JVM_ARGS=-Xms64m -Xmx512m
@@ -220,14 +194,8 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /app/wait-for.sh
-      - -q
-      - -t
-      - "300"
-      - request-db-adapter:8083
-      - --
-      - "/app/start-app.sh"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 #############################################################################
   so-monitoring:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-monitoring:${TAG}
@@ -250,8 +218,9 @@ services:
     ports:
       - "9092:9092"
     volumes:
-      - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ${CONFIG_DIR_PATH}/override-files/so-vnfm-adapter/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/certificates/so-vnfm-adapter-certs:/app/so-vnfm-adapter-certs
+      - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
     environment:
     - APP=so-vnfm-adapter
     - JVM_ARGS=-Xms64m -Xmx512m
@@ -264,14 +233,8 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /app/wait-for.sh
-      - -q
-      - -t
-      - "300"
-      - request-db-adapter:8083
-      - --
-      - "/app/start-app.sh"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 ################################################################################
   sdc-simulator:
     image: simulators/sdc-simulator:latest
@@ -314,8 +277,8 @@ services:
     ports:
       - "9093:9093"
     volumes:
-      - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ${CONFIG_DIR_PATH}/override-files/vnfm-simulator/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
     environment:
       - APP=VNFM-SIMULATOR
       - JVM_ARGS=-Xms64m -Xmx512m
@@ -381,4 +344,28 @@ services:
       - aai-simulator
     command:
         - "/config/populate-aai-simulator.sh"
+################################################################################
+  ve-vnfm-adapter:
+    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/ve-vnfm-adapter:${TAG}
+    ports:
+      - "9098:9098"
+    volumes:
+      - ${CONFIG_DIR_PATH}/override-files/ve-vnfm-adapter/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
+    environment:
+      - APP=ve-vnfm-adapter
+      - JVM_ARGS=-Xms64m -Xmx512m
+      - DB_HOST=mariadb
+    hostname:
+      ve-vnfm-adapter
+    depends_on:
+      - request-db-adapter
+      - aai-simulator
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 ################################################################################