diff options
| author |   Hesam Rahimi <hesam.rahimi@huawei.com> | 2021-06-07 20:02:32 +0000 |
|---|---|---|
| committer |   KAPIL SINGAL <ks220y@att.com> | 2021-06-22 16:50:48 +0000 |
| commit | 55378e7480442b8cee46d215a85e194c56b38f36 (patch) | |
| tree | 991ff17070697c5cfef7306b3f195ed1b258a236 /installation/src/main | |
| parent | b20349a92894af9b948c8bf2b5c67c5bd86f9da5 (diff) | |
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) <ks220y@att.com>
Change-Id: I68f8f4780804a2014b73b5eeb9dba29d1896a602
Former-commit-id: 866ddebbcac80c38c79c46bb37373123a0c678f0
Diffstat (limited to 'installation/src/main')
| -rw-r--r-- | installation/src/main/yaml/docker-compose.yml | 14 | ||||
| -rw-r--r-- | installation/src/main/yaml/sdnc-basic.yml | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml index 6a2e3ff0..110f940b 100644 --- a/installation/src/main/yaml/docker-compose.yml +++ b/installation/src/main/yaml/docker-compose.yml @@ -20,9 +20,9 @@ services: - MYSQL_USER=${MYSQL_USER} - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_DATABASE=${MYSQL_DATABASE} - logging: + logging: driver: "json-file" - options: + options: max-size: "30m" max-file: "5" @@ -55,7 +55,7 @@ services: depends_on : - db - ansible - container_name: sdnc_controller_container + container_name: sdnc_controller entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"] ports: - "8282:8181" @@ -76,7 +76,7 @@ services: - ODL_ADMIN_PASSWORD=${ODL_PASSWORD} - ODL_USER=${ODL_USER} - ODL_PASSWORD=${ODL_PASSWORD} - - SDNC_DB_INIT=true + - SDNC_DB_INIT=true - HONEYCOMB_USER=${HONEYCOMB_USER} - HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD} - TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD} @@ -110,7 +110,7 @@ services: image: onap/ccsdk-dgbuilder-image:latest depends_on: - db - container_name: sdnc_dgbuilder_container + container_name: sdnc_dgbuilder_container entrypoint: - "/bin/bash" - "-c" @@ -138,7 +138,7 @@ services: image: onap/sdnc-ueb-listener-image:latest depends_on: - db - container_name: sdnc_ueblistener_container + container_name: sdnc_ueblistener_container entrypoint: ["/opt/onap/sdnc/ueb-listener/bin/start-ueb-listener.sh" ] links: - db:dbhost @@ -165,7 +165,7 @@ services: image: onap/sdnc-dmaap-listener-image:latest depends_on: - db - container_name: sdnc_dmaaplistener_container + container_name: sdnc_dmaaplistener_container entrypoint: ["/opt/onap/sdnc/dmaap-listener/bin/start-dmaap-listener.sh" ] links: - db:dbhost diff --git a/installation/src/main/yaml/sdnc-basic.yml b/installation/src/main/yaml/sdnc-basic.yml index f68e07d9..4a9d47ca 100644 --- a/installation/src/main/yaml/sdnc-basic.yml +++ b/installation/src/main/yaml/sdnc-basic.yml @@ -20,9 +20,9 @@ services: - MYSQL_USER=${MYSQL_USER} - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_DATABASE=${MYSQL_DATABASE} - logging: + logging: driver: "json-file" - options: + options: max-size: "30m" max-file: "5" @@ -30,7 +30,7 @@ services: image: onap/sdnc-image:latest depends_on : - db - container_name: sdnc_controller_container + container_name: sdnc_controller entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"] ports: - "8282:8181" @@ -50,7 +50,7 @@ services: - ODL_ADMIN_PASSWORD=${ODL_PASSWORD} - ODL_USER=${ODL_USER} - ODL_PASSWORD=${ODL_PASSWORD} - - SDNC_DB_INIT=true + - SDNC_DB_INIT=true - HONEYCOMB_USER=${HONEYCOMB_USER} - HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD} - TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD} |