summaryrefslogtreecommitdiffstats
path: root/docker/startup.sh
diff options
context:
space:
mode:
Diffstat (limited to 'docker/startup.sh')
-rw-r--r--docker/startup.sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/docker/startup.sh b/docker/startup.sh
index 46925ae..8b7d914 100644
--- a/docker/startup.sh
+++ b/docker/startup.sh
@@ -1,17 +1,18 @@
#!/bin/sh
-#set -x
-# Run chef-solo for configuration
-cd /var/opt/dcae-fe/chef-solo
-chef-solo -c solo.rb -E ${ENVNAME} --log_level "debug" --logfile "/tmp/Chef-Solo.log"
+JAVA_OPTIONS=" ${JAVA_OPTIONS} -Dconfig.home=${JETTY_BASE}/config
+ -Dlog.home=${JETTY_BASE}/logs
+ -Dlogback.configurationFile=${JETTY_BASE}/dcae-fe/logback-spring.xml"
+
+cd /root/chef-solo
+chef-solo -c solo.rb -E ${ENVNAME}
status=$?
-if [ $status != 0 ]; then
+if [[ ${status} != 0 ]]; then
echo "[ERROR] Problem detected while running chef. Aborting !"
exit 1
fi
-# Execute Jetty
cd /var/lib/jetty
/docker-entrypoint.sh &