Make the main script an executable for if I want to run it on my host

Fix image sprawl to work

Fix port range

Signed-off-by: Jessica Frazelle <princess@docker.com>
This commit is contained in:
Jessica Frazelle 2015-06-08 19:15:41 -07:00
parent d48d691ec2
commit 0231a7f5de
3 changed files with 16 additions and 13 deletions

0
docker-bench-security.sh Normal file → Executable file
View file

View file

@ -201,9 +201,11 @@ else
fail=0
for c in $containers; do
port=$(docker port "$c" | awk '{print $1}' | cut -d '/' -f1)
ports=$(docker port "$c" | awk '{print $1}' | cut -d '/' -f1)
if [ ! -z "$port" ] && [ "$port" -lt 1025 ]; then
# iterate through port range (line delimited)
for port in $ports; do
if [ ! -z "$port" ] && [ "0$port" -lt 1025 ]; then
# If it's the first container, fail the test
if [ $fail -eq 0 ]; then
warn "$check_5_8"
@ -214,6 +216,7 @@ else
fi
fi
done
done
# We went through all the containers and found no privileged ports
if [ $fail -eq 0 ]; then
pass "$check_5_8"

View file

@ -40,8 +40,8 @@ images=$(docker images -q | wc -l | awk '{print $1}')
active_images=0
for c in $(docker inspect -f "{{.Image}}" $(docker ps -qa)); do
if [[ $(docker images --no-trunc -a | grep $c) ]]; then
((active_images++))
if docker images --no-trunc -a | grep $c > /dev/null ; then
active_images=$(( active_images += 1 ))
fi
done
@ -53,7 +53,7 @@ else
info " * There are currently: $images images"
fi
if [[ "$active_images" -lt "$((images / 2))" ]]; then
if [ "$active_images" -lt "$((images / 2))" ]; then
warn " * Only $active_images out of $images are in use"
fi