github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Do not try to run metrics proxy when not configured

Browse Source 
Failure test case was not correct; printed a (harmless) error message
that was confusing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-02-09 13:58:03 +00:00
parent 62794285aa
commit 155676ee21
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
alpine/packages/docker/etc/init.d/docker
View File

@ -124,8 +124,8 @@ start()
# On desktop forward metrics to host if enabled in daemon.json # On desktop forward metrics to host if enabled in daemon.json
case "$(mobyplatform)" in case "$(mobyplatform)" in
windows|mac) windows|mac)
METRICS_ADDR=$(cat /etc/docker/daemon.json | jq -r '."metrics-addr"') METRICS_ADDR=$(cat /etc/docker/daemon.json | jq -e -r '."metrics-addr"')
if [ -n "$METRICS_ADDR" ] if [ $? -eq 0 ]
then then
METRICS_IP="$(echo "$METRICS_ADDR" | cut -d: -f1)" METRICS_IP="$(echo "$METRICS_ADDR" | cut -d: -f1)"
METRICS_PORT="$(echo "$METRICS_ADDR" | cut -d: -f2)" METRICS_PORT="$(echo "$METRICS_ADDR" | cut -d: -f2)"