From 7c98e9950cb20c986ff7a319baad808f15262864 Mon Sep 17 00:00:00 2001
From: Jorge Hernandez <jh1730@att.com>
Date: Mon, 2 Apr 2018 17:53:09 -0500
Subject: Companion changes to apps startup improvements

see https://gerrit.onap.org/r/40577 for reference

Change-Id: I76eb0d791a012d1ad2046ef27ec9f8b181cf3cb3
Issue-ID: POLICY-534
Signed-off-by: Jorge Hernandez <jh1730@att.com>
---
 packages/docker/pom.xml                           |  4 ++--
 packages/docker/src/main/docker/Dockerfile        |  6 +++---
 packages/docker/src/main/docker/docker-install.sh | 11 ++++-------
 3 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'packages')

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index ff8ebadd..5d90809b 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -78,10 +78,10 @@
                                                         <artifactItems>
                                                                 <artifactItem>
                                                                         <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-                                                                        <artifactId>apps</artifactId>
+                                                                        <artifactId>apps-controlloop</artifactId>
                                                                         <version>${project.version}</version>
                                                                         <type>zip</type>
-                                                                        <destFileName>apps.zip</destFileName>
+                                                                        <destFileName>apps-controlloop.zip</destFileName>
                                                                 </artifactItem>
                                                         </artifactItems>
                                                 </configuration>
diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index d4d427b5..6d5c4ab7 100644
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -42,13 +42,13 @@ RUN mkdir -p ${POLICY_HOME}/config ${POLICY_LOGS} ${POLICY_INSTALL}/config && \
 
 WORKDIR ${POLICY_INSTALL}
 
-COPY install-drools.zip apps.zip docker-install.sh do-start.sh wait-for-port.sh ./
+COPY install-drools.zip apps-controlloop.zip docker-install.sh do-start.sh wait-for-port.sh ./
 
 VOLUME [ "${POLICY_INSTALL}/config", "${POLICY_HOME}/config" ]
 
 RUN unzip -o install-drools.zip && \
-    unzip -o apps.zip && \
-    rm install-drools.zip apps.zip && \
+    unzip -o apps-controlloop.zip && \
+    rm install-drools.zip apps-controlloop.zip && \
     chown -R policy:policy * && \
     chmod +x *.sh
 
diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh
index 5fb59c27..5ec25823 100644
--- a/packages/docker/src/main/docker/docker-install.sh
+++ b/packages/docker/src/main/docker/docker-install.sh
@@ -369,6 +369,8 @@ function install_base() {
 		fi
 	done
 
+	/bin/mkdir -p "${POLICY_HOME}/logs/" > /dev/null 2>&1
+
 	if [[ ! ( -d "$POLICY_HOME" && -w "$POLICY_HOME" ) ]]; then
 		echo "ERROR: Installation directory $POLICY_HOME does not exist or not writable"
 		exit 1
@@ -386,11 +388,6 @@ function install_base() {
 			exit 1
 		fi
 	
-		if ! /bin/mkdir -p "${POLICY_HOME}/logs/" > /dev/null 2>&1; then
-			echo "error: aborting base installation: cannot create ${POLICY_HOME}/logs/"
-			exit 1
-		fi	
-	
 		if [[ -n ${POLICY_LOGS} ]]; then
 			if ! /bin/mkdir -p "${POLICY_LOGS}" > /dev/null 2>&1; then	
 				echo "error: aborting base installation: cannot create ${POLICY_LOGS}"
@@ -885,12 +882,12 @@ function do_install()
 	installArtifacts
 
 
-	if [[ -f apps-installer ]]; then
+	if [[ -f apps-controlloop-installer ]]; then
 		# if exists, any customizations to the 
 		# base drools installation from the drools apps
 		# is executed here
 
-		./apps-installer
+		./apps-controlloop-installer
 	fi
 	
 	echo
-- 
cgit 1.2.3-korg