github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 19:54:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #785 from justincormack/diag-version

Browse Source 
Use daemon version in diagnostics
This commit is contained in:
Justin Cormack 2016-11-24 05:11:13 -08:00 committed by GitHub
commit 0e5676d3ab
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/diagnostics/usr/bin/diagnostics
View File

@ -35,8 +35,8 @@ DOCKER=$(ps -eo args | grep '^dockerd')
CONTAINERD=$(ps -eo args | grep '^docker-containerd')
[ $? -eq 0 ] && ok "Process containerd running: $CONTAINERD\n" || fail "No containerd process\n"
DOCKERPS=$(docker ps 2>&1)
DOCKERV=$(docker --version)
[ $? -eq 0 ] && ok "Docker daemon working: ${DOCKERV}\n" || fail "Docker ps failed: $DOCKERPS\n"
DOCKERDV=$(docker version --format '{{.Server.Version}}')
[ $? -eq 0 ] && ok "Docker daemon working: ${DOCKERDV}\n" || fail "Docker ps failed: $DOCKERPS\n"
DIAGNOSTICS=$(ps -eo args | grep '^/usr/bin/diagnostics-server')
[ $? -eq 0 ] && ok "Diagnostics server running: $DIAGNOSTICS\n" || fail "No diagnostics server\n"
CONTAINERD=$(ps -eo args | grep '^/usr/bin/containerd')