diff options
| author |   Michael Lando <ml636r@att.com> | 2018-05-24 15:12:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-24 15:12:28 +0000 |
| commit | 6ada8ec44fad55cec2321231cb3b2eec48ccc1d1 (patch) | |
| tree | 9cf309e17df21a7daa10c954a0ec88cf461b44e4 | |
| parent | 1a0189f890e4ff65ee245be9b7ef67788ac53a61 (diff) | |
| parent | a0182011ebdf750e8d88adc0e6707f26dcaf1157 (diff) | |
Merge "Fix for OOM and Helm"
| -rw-r--r-- | docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore (renamed from docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/traststore) | bin | 4255 -> 4255 bytes | |||
| -rw-r--r-- | docker/docker_be/startup.sh | 7 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/traststore b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore Binary files differindex c408393..c408393 100644 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/traststore +++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore diff --git a/docker/docker_be/startup.sh b/docker/docker_be/startup.sh index a88cd36..25c367b 100644 --- a/docker/docker_be/startup.sh +++ b/docker/docker_be/startup.sh @@ -1,5 +1,6 @@ #!/bin/sh -set -x +#set -x + # Run chef-solo for configuration cd /var/opt/dcae-be/chef-solo chef-solo -c solo.rb -E ${ENVNAME} --log_level "debug" --logfile "/tmp/Chef-Solo.log" @@ -14,5 +15,5 @@ fi cd /var/lib/jetty /docker-entrypoint.sh & -#while true; do sleep 2; done -exec "$@";
\ No newline at end of file +while true; do sleep 2; done +#exec "$@"; |