From 28baa22239de22f0f0c13869ceeab67b97725d08 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 24 Nov 2016 12:20:39 +0000 Subject: [PATCH] Use daemon version in diagnostics Signed-off-by: Justin Cormack --- alpine/packages/diagnostics/usr/bin/diagnostics | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/packages/diagnostics/usr/bin/diagnostics b/alpine/packages/diagnostics/usr/bin/diagnostics index f74d874f7..3953c2be7 100755 --- a/alpine/packages/diagnostics/usr/bin/diagnostics +++ b/alpine/packages/diagnostics/usr/bin/diagnostics @@ -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')