mirror of
				https://github.com/docker/docker-bench-security.git
				synced 2025-11-04 02:58:59 +00:00 
			
		
		
		
	dist: adjust script imports to be able to use /usr/libexec
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:
		
					parent
					
						
							
								5c42b8ad5f
							
						
					
				
			
			
				commit
				
					
						a18798fcfa
					
				
			
		
					 1 changed files with 7 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -9,9 +9,11 @@
 | 
			
		|||
 | 
			
		||||
version='1.6.0'
 | 
			
		||||
 | 
			
		||||
LIBEXEC="." # Distributions can change this to /usr/libexec or similar.
 | 
			
		||||
 | 
			
		||||
# Load dependencies
 | 
			
		||||
. ./functions/functions_lib.sh
 | 
			
		||||
. ./functions/helper_lib.sh
 | 
			
		||||
. $LIBEXEC/functions/functions_lib.sh
 | 
			
		||||
. $LIBEXEC/functions/helper_lib.sh
 | 
			
		||||
 | 
			
		||||
# Setup the paths
 | 
			
		||||
this_path=$(abspath "$0")       ## Path of this file including filename
 | 
			
		||||
| 
						 | 
				
			
			@ -99,7 +101,7 @@ do
 | 
			
		|||
done
 | 
			
		||||
 | 
			
		||||
# Load output formating
 | 
			
		||||
. ./functions/output_lib.sh
 | 
			
		||||
. $LIBEXEC/functions/output_lib.sh
 | 
			
		||||
 | 
			
		||||
yell_info
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -161,8 +163,8 @@ main () {
 | 
			
		|||
    images=$(docker images -q $LABELS| grep -v "$benchcont")
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  for test in tests/*.sh; do
 | 
			
		||||
    . ./"$test"
 | 
			
		||||
  for test in $LIBEXEC/tests/*.sh; do
 | 
			
		||||
    . "$test"
 | 
			
		||||
  done
 | 
			
		||||
 | 
			
		||||
  if [ -z "$check" ] && [ ! "$checkexclude" ]; then
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue