Dockerfile improvements

[dmaap/buscontroller.git] / dmaap-bc / misc / dmaapbc

diff --git a/dmaap-bc/misc/dmaapbc b/dmaap-bc/misc/dmaapbc
index f1e8ae7..74e8707 100644 (file)
--- a/dmaap-bc/misc/dmaapbc
+++ b/dmaap-bc/misc/dmaapbc
@@ -52,13 +52,15 @@ config() {
                echo "Expected app root directory $APP_ROOT does not exist"
                exit 1
        fi
+
+       cd $APP_ROOT
        if [ !  -f $CONTAINER_CONFIG ]
        then
                echo "WARNING: Expected env file $CONTAINER_CONFIG not found. Default behaviors in effect"
                find $CONTAINER_ROOT -type f
+       else 
+           source $CONTAINER_CONFIG
        fi
-       cd $APP_ROOT
-       source $CONTAINER_CONFIG
 
        if [ "$DMAAPBC_WAIT_TO_EXIT" != "Y" ]
        then
@@ -68,12 +70,6 @@ config() {
                echo "Not creating $APP_ROOT/ok_to_exit"
        fi      
        
-       if [ ! -f $APP_ROOT/misc/cert-client-init.sh ]
-       then
-               echo "Did not find $APP_ROOT/misc/cert-client-init.sh to append to truststore"
-               exit 1
-       fi
-       $APP_ROOT/misc/cert-client-init.sh
        . misc/havecert.tmpl > etc/havecert
        chmod +x etc/havecert