Commit graph

853 commits

Author SHA1 Message Date
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
Thomas Sjögren
7ad1c816e8 update README and contributors
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-28 12:30:34 +02:00
Thomas Sjögren
17c6262d2f formating
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-28 12:14:35 +02:00
Thomas Sjögren
d7f1d9753a ignore section 8 if community edition
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-28 11:49:22 +02:00
Thomas Sjögren
a785c02c59 add INFO for section 8
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-28 10:26:44 +02:00
Thomas Sjögren
adb6a42c4a update function names
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-27 16:11:55 +02:00
Thomas Sjögren
7110df800b section 8 docker enterprise skeleton
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-27 16:11:38 +02:00
Thomas Sjögren
bcd6e5dd55 json sections
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-27 16:10:59 +02:00
Thomas Sjögren
ca3714bc16 first pass on section 7
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-27 16:03:29 +02:00
Thomas Sjögren
3d6dd81956 first pass on section 6
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-27 15:52:06 +02:00
Thomas Sjögren
0b007baf7e first pass on section 5
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-27 15:43:29 +02:00
Thomas Sjögren
e5c22c5f01 first pass on section 4
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-27 15:25:54 +02:00
Thomas Sjögren
f968597051 first pass on section 3
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-27 15:13:19 +02:00
Thomas Sjögren
bb0d65ceb1 update function list
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-27 14:54:23 +02:00
Thomas Sjögren
6c6d0836a4 first pass on section 2
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-27 14:54:08 +02:00
Thomas Sjögren
82644982a8 move old 2.13 to community checks
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-27 14:53:42 +02:00
Thomas Sjögren
d963b93fcc update info output
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-26 15:13:50 +02:00
Thomas Sjögren
f2a7e6d6a6 update sect 1 function names
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-26 15:13:31 +02:00