From eb249712ec2f805365ad077beb35644864311be9 Mon Sep 17 00:00:00 2001 From: rope252 Date: Thu, 16 Apr 2020 14:36:02 +0100 Subject: CSIT Image version upgrade to 1.6.0x from 1.5.2 Change-Id: Id9b7d727c1e0f21a7d41c040168a875240c46e9b Issue-ID: INT-1515 Signed-off-by: rope252 --- .../so/integration-etsi-testing/docker-compose.yml | 68 +++++----------------- 1 file changed, 15 insertions(+), 53 deletions(-) (limited to 'plans/so/integration-etsi-testing/docker-compose.yml') diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml index 96eea965..ae8d7746 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,10 +133,8 @@ 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} @@ -184,14 +164,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"' ################################################################################ api-handler-infra: image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/api-handler-infra:${TAG} @@ -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} @@ -264,14 +232,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 -- cgit 1.2.3-korg