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
670 commits 3 branches 11 tags 4.9 MiB
Commit graph

670 commits

This branch
This branch
All branches
Author SHA1 Message Date
zawazawa0316
12f19d9f64 Fix check conditions 
Signed-off-by: zawazawa0316 <37421794+zawazawa0316@users.noreply.github.com>
 2020-03-07 05:24:24 +09:00
Thomas Sjögren
11da147df9
Merge pull request #407 from Intermax-Cloudsourcing/allow-include-checks-mixing 
fix: allow combining include and exclude
 2020-01-29 12:07:32 +00:00
wilmardo
4054055546 fix: uncomment PATH variable 
Signed-off-by: wilmardo <info@wilmardenouden.nl>
 2020-01-29 10:31:15 +01:00
Thomas Sjögren
9696a8bd6a
Merge pull request #413 from konstruktoid/alpineupdate 
alpine:3.11
 2019-12-21 20:32:28 +00:00
Thomas Sjögren
685236f4e6 alpine:3.11 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-12-21 21:31:33 +01:00
Thomas Sjögren
d9a70bc006
Merge pull request #412 from konstruktoid/ISSUE410b 
locate configuration file before we run the tests #410
 2019-12-18 07:21:32 +00:00
Thomas Sjögren
269b71eed8 locate configuration file before we run the tests #410 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-12-17 15:03:54 +01:00
Thomas Sjögren
19173cb954
Merge pull request #411 from konstruktoid/ISSUE410 
correct grep #410
 2019-12-17 09:19:39 +00:00
Thomas Sjögren
c8c5615061 correct grep #410 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-12-16 09:57:21 +01:00
Thomas Sjögren
3c545daccf
Merge pull request #409 from konstruktoid/ISSUE408 
catch json w/o space #408
 2019-12-13 13:00:06 +00:00
Thomas Sjögren
e21999c5c7 catch json w/o space #408 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-12-12 11:03:23 +01:00
wilmardo
155c739fc9 feat: all mixes of include and excludes are now supported 
Signed-off-by: wilmardo <info@wilmardenouden.nl>
 2019-12-09 15:19:17 +01:00
wilmardo
f1c4dc4cd6 docs: Adds example of combining include and exclude 
Signed-off-by: wilmardo <info@wilmardenouden.nl>
 2019-12-05 16:21:46 +01:00
wilmardo
91d36b62f9 refact: removes variable, use result directly in loop 
Signed-off-by: wilmardo <info@wilmardenouden.nl>
 2019-12-05 16:20:47 +01:00
wilmardo
cf9baa76ae feat: improve sed match 
Signed-off-by: wilmardo <info@wilmardenouden.nl>
 2019-12-05 15:51:14 +01:00
wilmardo
1b37a1e6bc fix: allow combining include and exclude 
Signed-off-by: wilmardo <info@wilmardenouden.nl>
 2019-12-04 15:35:11 +01:00
Thomas Sjögren
c35d71f533
Merge pull request #406 from jammasterj89/master 
Reorder of sed command on images
 2019-12-04 11:23:33 +00:00
jammasterj89
d2963b4c42
Reorder of sed command on images 
Ensure sed command is first when filtering on images to ensure the description row is removed correctly.

Signed-off-by: Niall T <jammasterj89@gmail.com>
 2019-12-04 11:14:43 +00:00
Thomas Sjögren
c2caa29512
Merge pull request #404 from konstruktoid/logimg 
remove macosx shadow...
 2019-11-05 10:35:53 +00:00
Thomas Sjögren
b3029904d6 remove macosx shadow... 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-11-05 11:34:51 +01:00
Thomas Sjögren
85544e1f69
Merge pull request #403 from konstruktoid/verimage 
update benchmark_log.png and contributors
 2019-11-05 09:48:52 +00:00
Thomas Sjögren
8163884633 update benchmark_log.png and contributors 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-11-05 10:46:15 +01:00
Thomas Sjögren
8ebf21bbc9
Merge pull request #402 from konstruktoid/linting 
shellcheck
 2019-10-16 11:49:40 +02:00
Thomas Sjögren
ddad135d13 shellcheck 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-10-16 09:49:18 +02:00
Thomas Sjögren
bf42355279
Merge pull request #401 from AurelienGasser/patch-1 
support whitespace in PATH
 2019-10-08 08:44:17 +02:00
Aurélien Gasser
577e9f5edb support whitespace in PATH 
Signed-off-by: Aurélien Gasser <aurelien.gasser@gmail.com>
 2019-10-07 10:32:58 -04:00
Thomas Sjögren
3bee5e6a54
Merge pull request #398 from konstruktoid/ISSUE397 
fix /etc/sysconfig/docker
 2019-10-04 14:51:50 +02:00
Thomas Sjögren
d680213a7b fix /etc/sysconfig/docker 
closes #397

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-10-04 14:50:48 +02:00
Thomas Sjögren
6d73492aab
Merge pull request #392 from jammasterj89/master 
Fixed exclude flag issue with functions_lib.sh
 2019-09-02 14:29:59 +02:00
jammasterj89
f4e33ee54e
Fixed exclude flag issue with functions_lib.sh 
Include the all text named functions within functions_lib.sh call if the -e flag is set.

Signed-off-by: Niall T <jammasterj89@gmail.com>
 2019-09-02 13:22:28 +01:00
Thomas Sjögren
b354514d29
Merge pull request #385 from J0WI/ro 
Mount volumes read only
 2019-08-29 15:13:34 +02:00
J0WI
59c289eefe Mount volumes read only 
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
 2019-08-29 15:11:26 +02:00
Thomas Sjögren
d1934b614e
Merge pull request #390 from jammasterj89/master 
Issue #383 ability to exclude images
Closes #383, #369
 2019-08-29 15:10:53 +02:00
jammasterj89
3d02432bc8
Removed whitespace 
Signed-off-by: Niall T <jammasterj89@gmail.com>
 2019-08-29 13:48:24 +01:00
jammasterj89
ef206be6e0 Remove -t parameter 
Removed -t parameter

Signed-off-by: Niall T <jammasterj89@gmail.com>
 2019-08-29 13:37:59 +01:00
jammasterj89
e1d26673ee 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>
 2019-08-29 13:37:50 +01:00
jammasterj89
6cd952c7a1 Remove check_images 
Removed check_images due to removal of -t parameter

Signed-off-by: Niall T <jammasterj89@gmail.com>
 2019-08-29 13:37:46 +01:00
jammasterj89
c53157e184 Remove -t parameter 
$images now set via -i and -x parameters

Signed-off-by: Niall T <jammasterj89@gmail.com>
 2019-08-29 13:37:41 +01:00
jammasterj89
7f29aebd71 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>
 2019-08-29 13:37:35 +01:00
jammasterj89
af8b59f29d 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>
 2019-08-29 13:37:29 +01:00
jammasterj89
4bb6e19965 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>
 2019-08-29 13:37:10 +01:00
Thomas Sjögren
495a8674c4
Merge pull request #391 from konstruktoid/master 
catch community editions.
 2019-08-29 13:03:07 +02:00
Thomas Sjögren
e9d7398893 Merge branch 'master' of github.com:konstruktoid/docker-bench-security 
* 'master' of github.com:konstruktoid/docker-bench-security:
  catch community editions
 2019-08-29 13:00:48 +02:00
Thomas Sjögren
0cac0e339d catch community editions 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-08-29 10:29:38 +02:00
Thomas Sjögren
c8a7e87132
Merge pull request #386 from J0WI/enhance-install 
Enhance installation of docker cli
 2019-08-29 10:28:27 +02:00
Thomas Sjögren
4f3898257f catch community editions 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-08-29 09:53:40 +02:00
Thomas Sjögren
5a829f9e8c
Merge pull request #389 from konstruktoid/CDB120 
Cdb120
 2019-08-28 13:12:05 +02:00
Thomas Sjögren
77a3bc65d7 fix 5.28 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-08-28 12:59:49 +02:00
Thomas Sjögren
261e3f2611 update version yell 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-08-28 12:43:06 +02:00
Thomas Sjögren
71f63a192a tmp fix for json 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2019-08-28 12:36:49 +02:00