GuillaumeHemmen/docker-bench-security
1
0
Fork 0
mirror of https://github.com/docker/docker-bench-security.git synced 2024-11-01 08:31:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

dist: adjust script imports to be able to use /usr/libexec

Browse source 
In order to make installation easier for distributions, make all script
imports based on a single variable that distributions can adjust based
on how the script is packaged for each distribution.

Ideally we would actually install the script in /usr/libexec rather than
/ in our Dockerfile, but this is a simpler fix that still lets you run
the script from the repo directory.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
This commit is contained in:
Aleksa Sarai 2024-10-18 13:17:01 +11:00
parent 5c42b8ad5f
commit a18798fcfa
No known key found for this signature in database
GPG key ID: 2897FAD2B7E9446F
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
docker-bench-security.sh
View file

@ -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