summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorAreli, Fuss (af732p) <af732p@att.com>2018-05-23 13:54:07 +0300
committerAreli, Fuss (af732p) <af732p@att.com>2018-05-23 13:54:07 +0300
commita0182011ebdf750e8d88adc0e6707f26dcaf1157 (patch)
tree1b8810d25d9c0e15701b6afa88708193bf183aac /docker
parent3e4c18770957b55e2f80da32c3a32caa908f1386 (diff)
Fix for OOM and Helm
Fix for OOM and Helm Change-Id: Ie1312a0035a5f82f232bcfd14d0b5a6a8f513e57 Issue-ID: SDC-1361 Signed-off-by: Areli, Fuss (af732p) <af732p@att.com>
Diffstat (limited to 'docker')
-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)bin4255 -> 4255 bytes
-rw-r--r--docker/docker_be/startup.sh7
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
index 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
Binary files differ
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 "$@";