Merge pull request #36505 from Crassirostris/kibana-image-fix

Automatic merge from submit-queue Fix startup script bug in kibana image Big thanks to @lhopki01 for noticing this! As mention in discussion in https://github.com/kubernetes/kubernetes/pull/36103 current image crashes if we don't want to work behind proxy because of string interpolation in bash. @piosz

Merge pull request #36505 from Crassirostris/kibana-image-fix
b392910b · Kubernetes Submit Queue · GitHub · 9922489a · 94eeca8d · b392910b
Commit b392910b authored Nov 09, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 09, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

run.sh cluster/addons/fluentd-elasticsearch/kibana-image/run.sh +1 -1

No files found.
--- a/cluster/addons/fluentd-elasticsearch/kibana-image/run.sh
+++ b/cluster/addons/fluentd-elasticsearch/kibana-image/run.sh
@@ -17,7 +17,7 @@
 export ELASTICSEARCH_URL=${ELASTICSEARCH_URL:-"http://localhost:9200"}
 echo ELASTICSEARCH_URL=${ELASTICSEARCH_URL}

-export KIBANA_BASE_URL=${KIBANA_BASE_URL:-""}
+export KIBANA_BASE_URL=${KIBANA_BASE_URL:-"''"}
 echo "server.basePath: ${KIBANA_BASE_URL}"
 echo "server.basePath: ${KIBANA_BASE_URL}" >> /kibana/config/kibana.yml