From 55378e7480442b8cee46d215a85e194c56b38f36 Mon Sep 17 00:00:00 2001 From: Hesam Rahimi Date: Mon, 7 Jun 2021 20:02:32 +0000 Subject: Effort to reduce image layer and size Removing few ENV version variable and those should be read from pom properties (maven-resource-plugin filtering true) Combined Dockerfile and Standalone.Dockerfile Adding Docker build arg AAF which will decide whether to add aaa-app-config.xml in docker image or not for standalone Updated docker-maven-plugin to 0.34.0 to have noCache true Removing start-it-container execution as it's being tested by CSIT Replacing maven-exec-plugin with maven-antrun-plugin Updating latest base docker images versions Updating parent version to 2.1.7 Issue-ID: CCSDK-3226 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I68f8f4780804a2014b73b5eeb9dba29d1896a602 Former-commit-id: 866ddebbcac80c38c79c46bb37373123a0c678f0 --- csit/scripts/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'csit/scripts/docker-compose.yml') diff --git a/csit/scripts/docker-compose.yml b/csit/scripts/docker-compose.yml index 4a36dc7a..525538a4 100755 --- a/csit/scripts/docker-compose.yml +++ b/csit/scripts/docker-compose.yml @@ -24,7 +24,7 @@ services: sdnc: image: onap/sdnc-image:latest - container_name: sdnc + container_name: sdnc_controller volumes: - /etc/localtime:/etc/localtime:ro - $SDNC_CERT_PATH:/opt/opendaylight/current/certs @@ -50,7 +50,7 @@ services: - ODL_USER=${ODL_USER} - ODL_PASSWORD=${ODL_PASSWORD} - ODL_CERT_DIR=/opt/opendaylight/current/certs - - SDNC_DB_INIT=true + - SDNC_DB_INIT=true - HONEYCOMB_USER=${HONEYCOMB_USER} - HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD} - TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD} -- cgit 1.2.3-korg