mirror of
https://github.com/docker/docker-bench-security.git
synced 2024-11-01 00:21:45 +01:00
Merge pull request #559 from cyphar/dist-libexec
dist: adjust script imports to be able to use /usr/libexec
This commit is contained in:
commit
ff26d67f25
1 changed files with 7 additions and 5 deletions
|
@ -9,9 +9,11 @@
|
||||||
|
|
||||||
version='1.6.0'
|
version='1.6.0'
|
||||||
|
|
||||||
|
LIBEXEC="." # Distributions can change this to /usr/libexec or similar.
|
||||||
|
|
||||||
# Load dependencies
|
# Load dependencies
|
||||||
. ./functions/functions_lib.sh
|
. $LIBEXEC/functions/functions_lib.sh
|
||||||
. ./functions/helper_lib.sh
|
. $LIBEXEC/functions/helper_lib.sh
|
||||||
|
|
||||||
# Setup the paths
|
# Setup the paths
|
||||||
this_path=$(abspath "$0") ## Path of this file including filename
|
this_path=$(abspath "$0") ## Path of this file including filename
|
||||||
|
@ -99,7 +101,7 @@ do
|
||||||
done
|
done
|
||||||
|
|
||||||
# Load output formating
|
# Load output formating
|
||||||
. ./functions/output_lib.sh
|
. $LIBEXEC/functions/output_lib.sh
|
||||||
|
|
||||||
yell_info
|
yell_info
|
||||||
|
|
||||||
|
@ -161,8 +163,8 @@ main () {
|
||||||
images=$(docker images -q $LABELS| grep -v "$benchcont")
|
images=$(docker images -q $LABELS| grep -v "$benchcont")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for test in tests/*.sh; do
|
for test in $LIBEXEC/tests/*.sh; do
|
||||||
. ./"$test"
|
. "$test"
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -z "$check" ] && [ ! "$checkexclude" ]; then
|
if [ -z "$check" ] && [ ! "$checkexclude" ]; then
|
||||||
|
|
Loading…
Reference in a new issue