From 7b43110a917e6bcdf3df73cf4c0e1b2e9520e17b Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Thu, 25 Feb 2021 07:51:55 -0500
Subject: [PATCH] Resolve issues starting with docker-compose

Resolve issues starting sdnc container with docker-compose

Change-Id: I406a940b6c8270865b7454ba7de3ed754b448321
Issue-ID: SDNC-1473
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 installation/sdnc/src/main/docker/Dockerfile       |  3 +++
 .../sdnc/src/main/docker/standalone.Dockerfile     |  2 ++
 .../main/properties/svclogic-compiler.properties   | 29 ++++++++++++++++++++++
 installation/src/main/yaml/docker-compose.yml      |  3 +++
 4 files changed, 37 insertions(+)
 create mode 100644 installation/src/main/properties/svclogic-compiler.properties

diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index de928934..4de1bb3f 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -53,6 +53,9 @@ RUN echo org.ops4j.pax.web.ssl.keystore=$SDNC_STORE_DIR/$SDNC_KEYSTORE >> $ODL_H
 RUN echo org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
 RUN echo org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
 
+# Overwrite svclogic compiler properties
+RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties
+
 RUN chown -R odl:odl /opt
 
 USER odl
diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile
index fe6aa083..03f5eb9b 100755
--- a/installation/sdnc/src/main/docker/standalone.Dockerfile
+++ b/installation/sdnc/src/main/docker/standalone.Dockerfile
@@ -50,6 +50,8 @@ RUN echo org.ops4j.pax.web.ssl.keystore=$SDNC_STORE_DIR/$SDNC_KEYSTORE >> $ODL_H
 RUN echo org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
 RUN echo org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
 
+# Overwrite svclogic compiler properties
+RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties
 RUN chown -R odl:odl /opt
 
 USER odl
diff --git a/installation/src/main/properties/svclogic-compiler.properties b/installation/src/main/properties/svclogic-compiler.properties
new file mode 100644
index 00000000..5a228f9f
--- /dev/null
+++ b/installation/src/main/properties/svclogic-compiler.properties
@@ -0,0 +1,29 @@
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights
+# 						reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+# svclogic properties for compiler, which uses jdbc instead of dblib.  This version 
+# should be installed in $SDNC_ROOT/svclogic/config
+
+org.onap.ccsdk.sli.dbtype = jdbc
+org.onap.ccsdk.sli.jdbc.url = jdbc:mysql://dbhost:3306/${MYSQL_DATABASE}
+org.onap.ccsdk.sli.jdbc.database = ${MYSQL_DATABASE}
+org.onap.ccsdk.sli.jdbc.user = ${MYSQL_USER}
+org.onap.ccsdk.sli.jdbc.password = ${MYSQL_PASSWORD}
diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index 01c972c4..6a2e3ff0 100644
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -66,6 +66,9 @@ services:
       - ansible:ansiblehost
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
       - SDNC_BIN=/opt/onap/sdnc/bin
       - ODL_CERT_DIR=/tmp
-- 
2.16.6