Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #383 ability to exclude images #390

Merged
merged 8 commits into from Aug 29, 2019

Conversation

@jammasterj89
Copy link
Contributor

commented Aug 27, 2019

@konstruktoid as per our discussion on issue #383

@GordonTheTurtle

This comment has been minimized.

Copy link

commented Aug 27, 2019

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "master" git@github.com:jammasterj89/docker-bench-security.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842358451912
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

docker-bench-security.sh Outdated Show resolved Hide resolved
@konstruktoid

This comment has been minimized.

Copy link
Member

commented Aug 29, 2019

LGTM but remove the white spaces and please sign your commits.
Closes #383

@konstruktoid

This comment has been minimized.

Copy link
Member

commented Aug 29, 2019

Closes #369

Added check_images
Added check_images which moves the previous $imgList into this function and removed the else as this is handled within the main .sh

Signed-off-by: Niall T <jammasterj89@gmail.com>
Added check_images
Added check_images to run the new check_images() function within tests/4_container_images.sh

Signed-off-by: Niall T <jammasterj89@gmail.com>
Added $images to $exclude
Added $images $exclude logic so now containers and images are excluded.
Added new $benchimagecont for images to replicate the $benchcont for containers.

Signed-off-by: Niall T <jammasterj89@gmail.com>
Remove -t parameter
$images now set via -i and -x parameters

Signed-off-by: Niall T <jammasterj89@gmail.com>
Remove check_images
Removed check_images due to removal of -t parameter

Signed-off-by: Niall T <jammasterj89@gmail.com>
Remove check_images
Removed check_images due to removal of -t parameter and $images being set in docker-bench-security.sh

Signed-off-by: Niall T <jammasterj89@gmail.com>
Remove -t parameter
Removed -t parameter

Signed-off-by: Niall T <jammasterj89@gmail.com>

@jammasterj89 jammasterj89 force-pushed the jammasterj89:master branch from baa569a to ef206be Aug 29, 2019

@GordonTheTurtle GordonTheTurtle removed the dco/no label Aug 29, 2019

Removed whitespace
Signed-off-by: Niall T <jammasterj89@gmail.com>
@konstruktoid

This comment has been minimized.

Copy link
Member

commented Aug 29, 2019

Thanks!

@konstruktoid konstruktoid merged commit d1934b6 into docker:master Aug 29, 2019

1 check passed

dco-signed All commits are signed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.