diff --git a/docker/docker.sh b/docker/docker.sh index 270db9e..e5d82db 100755 --- a/docker/docker.sh +++ b/docker/docker.sh @@ -49,7 +49,7 @@ RET=`${DOCKER} ps -a | tail -n +2 | awk -v IT="${ITEM}" ' BEGIN {$count=0;} { if docker.cpu) RET=`${DOCKER} stats --no-stream | tail -n +2 | awk -v IT="${ITEM}" ' BEGIN {$count=0;} {if ($1 == IT) count += 1} END {if (count > 1) print ""; else if (count == 1) print $3; else if (count == 0) print 0} '` - echo ${RET} + echo ${RET} | awk -v FS="%" '{print $1}' exit 0 ;; @@ -58,7 +58,7 @@ RET=`${DOCKER} stats --no-stream | tail -n +2 | awk -v IT="${ITEM}" ' BEGIN {$co #get ram usage docker.ram) -RET=`${DOCKER} stats --no-stream | tail -n +2 | awk -v IT="${ITEM}" ' BEGIN {$count=0;} {if ($1 == IT) count += 1} END {if (count > 1) print ""; else if (count == 1) print ($4*1024); else if (count == 0) print 0} '` +RET=`${DOCKER} stats --no-stream | tail -n +2 | awk -v IT="${ITEM}" ' BEGIN {$count=0;} {if ($1 == IT) count += 1} END {if (count > 1) print ""; else if (count == 1) print int($4*1048576); else if (count == 0) print 0} '` echo ${RET} exit 0