github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-26 20:18:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1171 from justincormack/metrics-proxy-fix

Browse Source 
Do not try to run metrics proxy when not configured
This commit is contained in:
Nathan LeClaire 2017-02-09 13:21:50 -08:00 committed by GitHub
commit 09746e4860
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)"