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

Merge pull request #153 from dhawal55/master

Browse source 
fix issue #152: Avoid picking early-docker by selecting newest docker daemon process
This commit is contained in:
Thomas Sjögren 2016-06-29 22:54:34 +02:00 committed by GitHub
commit 46ad0d7f06
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
helper_lib.sh
View file

@ -41,7 +41,7 @@ contains() {
get_command_line_args() { get_command_line_args() {
PROC="$1" PROC="$1"
for PID in $(pgrep -x -o "$PROC") for PID in $(pgrep -f -n "$PROC")
do do
tr "\0" " " < /proc/"$PID"/cmdline tr "\0" " " < /proc/"$PID"/cmdline
done done
@ -55,7 +55,7 @@ get_command_line_args() {
get_docker_cumulative_command_line_args() { get_docker_cumulative_command_line_args() {
OPTION="$1" OPTION="$1"
get_command_line_args docker | get_command_line_args "docker daemon" |
# normalize known long options to their short versions # normalize known long options to their short versions
sed \ sed \
-e 's/\-\-debug/-D/g' \ -e 's/\-\-debug/-D/g' \