GuillaumeHemmen/docker-bench-security
1
0
Fork 0
mirror of https://github.com/docker/docker-bench-security.git synced 2025-01-19 00:32:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Made some minor changes after check with ShellCheck. Also fixed

Browse source 
sourcing and verified that things work right with bash -x.

Signed-off-by: Scott McCarty <smccarty@redhat.com>
This commit is contained in:
Scott McCarty 2015-07-08 16:46:02 -04:00
parent cf836c35a6
commit 3f1e2c7c13
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/1_1_check.sh
View file

@ -1,7 +1,6 @@
# Run tests
THINPOOLDEV=`ps -ef | grep docker | awk '/--storage-opt/ { for (x=1;x<=NF;x++) if ($x~"--storage-opt") print $(x+1) }' | grep thinpooldev | awk -F\= '{print $2}'`
ROOTVOLUME=`df -P | grep " \/$" | awk '{print $1}'`
SEPARATEPARTITION=`grep /var/lib/docker /etc/fstab`
THINPOOLDEV=$(ps -ef | grep docker | awk '/--storage-opt/ { for (x=1;x<=NF;x++) if ($x~"--storage-opt") print $(x+1) }' | grep thinpooldev | awk -F= '{print $2}')
ROOTVOLUME=$(df -P | grep " \/$" | awk '{print $1}')
SEPARATEPARTITION=$(grep /var/lib/docker /etc/fstab)
# Verify that somebody didn't put a dummy entry in /etc/fstab and are really
# using devicemapper
@ -16,4 +15,4 @@ else
RETVAL=1
fi
return $RETVAL
return $RETVAL

2
tests/1_host_configuration.sh
View file

@ -5,7 +5,7 @@ info "1 - Host Configuration"
# 1.1
check_1_1="1.1 - Create a separate partition for containers"
sh 1_1_check.sh 2>&1
source tests/1_1_check.sh 2>&1
if [ $? -eq 0 ]; then
pass "$check_1_1"
else