Squash into one PR

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
This commit is contained in:
Thomas Sjögren 2015-05-30 08:48:08 +02:00
commit 315c208cae
5 changed files with 30 additions and 12 deletions

View file

@ -40,6 +40,7 @@ fi
# 1.6
check_1_6="1.6 - Keep Docker up to date"
docker_version=`docker version | grep 'Server version' | awk '{print $3}'`
do_version_check 1.6.2 $docker_version
if [ $? -eq 11 ]; then
warn "$check_1_6"
else
@ -48,7 +49,7 @@ fi
# 1.7
check_1_7="1.7 - Only allow trusted users to control Docker daemon"
docker_users=`cat /etc/group | grep docker`
docker_users=`grep docker /etc/group`
info "$check_1_7"
for u in $docker_users; do
info " * $u"