diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/bin/start.sh | 6 | ||||
| -rw-r--r-- | src/main/docker/Dockerfile | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh index 2f14a98..3d6036f 100644 --- a/src/main/bin/start.sh +++ b/src/main/bin/start.sh @@ -1,6 +1,8 @@ #!/bin/sh BASEDIR="/opt/app/search-data-service" +AJSC_HOME="$BASEDIR" +AJSC_CONF_HOME="$AJSC_HOME/bundleconfig/" if [ -z "$CONFIG_HOME" ]; then echo "CONFIG_HOME must be set in order to start up process" @@ -27,7 +29,9 @@ keytool -importkeystore -noprompt -deststorepass $PASS -destkeypass $PASS -srcke ## import into cacerts sudo keytool -importkeystore -noprompt -deststorepass changeit -destkeypass changeit -destkeystore /$JAVA_HOME/jre/lib/security/cacerts -srckeystore $BASEDIR/config/auth/onap.p12 -srcstoretype PKCS12 -srcstorepass $PASS -alias tomcat -PROPS="$PROPS -Dlogback.configurationFile=$BASEDIR/bundleconfig/etc/logback.xml" +PROPS="-DAJSC_HOME=$AJSC_HOME" +PROPS="$PROPS -DAJSC_CONF_HOME=$AJSC_CONF_HOME" +PROPS="$PROPS -Dlogging.config=$BASEDIR/bundleconfig/etc/logback.xml" PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME" PROPS="$PROPS -DKEY_STORE_PASSWORD=$KEY_STORE_PASSWORD" JVM_MAX_HEAP=${MAX_HEAP:-1024} diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 1fccaf4..ad402b2 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -13,9 +13,12 @@ RUN export JAVA_HOME # Build up the deployment folder structure RUN mkdir -p $MICRO_HOME +RUN mkdir -p $MICRO_HOME/bundleconfig/etc ADD search-data-service* $MICRO_HOME/ RUN mkdir -p $BIN_HOME COPY *.sh $BIN_HOME +COPY bundleconfig-local $MICRO_HOME/bundleconfig +COPY bundleconfig-local/etc/logback.xml $MICRO_HOME/bundleconfig/etc RUN chmod 755 $BIN_HOME/* RUN ln -s /logs $MICRO_HOME/logs |