From d809474a8754d9fd9675427d3b8d93ecffd2070f Mon Sep 17 00:00:00 2001 From: Hector Anapan Date: Thu, 10 Aug 2017 03:25:53 -0500 Subject: Modifying code to point to AAIService Properties Adding dblib.properties (mysql credential properties to the sdnctl db), modifying setenv.sh (used to define property values to mysql - such as authenticating against the MySQL DB's) and adding the APPC_CONFIG_DIR env variable as part of the Dockerfile. Patch: Reverted Unintentional changes to the docker-compose template. Patch: Changed some formatting as per Marcus's suggestions Change-Id: I7cf9d90405bb4d552779cd0cd8a4f01525bdd823 Signed-off-by: Hector Anapan Issue: [APPC-129] --- docker-compose/docker-compose.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'docker-compose') diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 2087d60..d431e66 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -15,12 +15,12 @@ services: environment: - MYSQL_ROOT_PASSWORD=openECOMP1.0 - MYSQL_ROOT_HOST=% - logging: - driver: "json-file" + logging: + driver: "json-file" options: max-size: "30m" max-file: "5" - + appc: image: "openecomp/appc-image:latest" @@ -41,17 +41,17 @@ services: - APPC_CONFIG_DIR=/opt/openecomp/appc/data/properties - DMAAP_TOPIC_ENV=SUCCESS logging: - driver: "json-file" + driver: "json-file" options: max-size: "30m" max-file: "5" - - + + dgbuilder: image: "openecomp/dgbuilder-sdnc-image:latest" depends_on: - db - container_name: sdnc_dgbuilder_container + container_name: sdnc_dgbuilder_container entrypoint: - "/bin/bash" - "-c" @@ -67,8 +67,8 @@ services: - MYSQL_ROOT_PASSWORD=openECOMP1.0 - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties - APPC_CONFIG_DIR=/opt/openecomp/appc/data/properties - logging: - driver: "json-file" - options: + logging: + driver: "json-file" + options: max-size: "30m" max-file: "5" -- cgit 1.2.3-korg