Commit graph

691 commits

Author SHA1 Message Date
Thomas Sjögren
fbe97f8858 Merge pull request #209 from konstruktoid/issue_207
default capabilities are OK to add, closes #207
2017-01-25 12:11:20 +01:00
Thomas Sjögren
68ed3dd845 default capabilities are OK to add, closes #207
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-25 12:07:14 +01:00
Maik Ellerbrock
85a32bf8c1
perf(docker): cleanup unused docker binaries
Signed-off-by: Maik Ellerbrock <opensource@frapsoft.com>
2017-01-25 10:55:17 +01:00
Thomas Sjögren
905c5719ef Merge pull request #208 from konstruktoid/issue_150
use grep if auditctl isnt present, closes #150
2017-01-25 10:32:51 +01:00
Thomas Sjögren
ea39505778 use grep if auditctl isnt present, closes #150
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-25 10:22:08 +01:00
Thomas Sjögren
5cd62e6138 Merge pull request #206 from konstruktoid/master
scale image
2017-01-24 16:17:18 +01:00
Thomas Sjögren
844f78b10c scale image
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-24 16:16:01 +01:00
Thomas Sjögren
28fe0f904f Merge pull request #205 from konstruktoid/version_image
update version and image
2017-01-24 15:57:04 +01:00
Thomas Sjögren
7a26b307ec update version and image
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-24 15:54:35 +01:00
Thomas Sjögren
c491038215 Merge pull request #204 from konstruktoid/113_5
1.13 Section 5
2017-01-24 15:27:15 +01:00
Thomas Sjögren
7f87db0768 1.13 Section 5
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-24 15:26:19 +01:00
Thomas Sjögren
ea4205db6f Merge pull request #203 from konstruktoid/113_2
1.13 Section 2
2017-01-24 13:42:32 +01:00
Thomas Sjögren
69435a0b3e update section 2
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-24 13:41:30 +01:00
Thomas Sjögren
d21e8ee0bb Merge pull request #202 from konstruktoid/113_1
1.13 Section 1
2017-01-24 09:47:37 +01:00
Thomas Sjögren
ab6c2cd02f Update section 1 to 1.13
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-24 09:45:24 +01:00
Thomas Sjögren
372dc08f26 CIS Docker 1.13 Benchmark, bump version
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-24 09:45:08 +01:00
Thomas Sjögren
a3071121d0 Merge pull request #201 from konstruktoid/master
correct sections
2017-01-23 17:43:04 +01:00
Thomas Sjögren
bed663d028 correct sections
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-23 17:41:29 +01:00
Thomas Sjögren
244cb2ae55 Merge pull request #200 from konstruktoid/permissions
update permission checks
2017-01-23 17:32:15 +01:00
Thomas Sjögren
b766037da8 update permission checks
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-23 17:26:07 +01:00
Thomas Sjögren
9b7177237c Merge pull request #199 from konstruktoid/info_messages
update info messages, not scored
2017-01-23 17:07:54 +01:00
Thomas Sjögren
77617321df update info messages, not scored
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-23 17:06:10 +01:00
Thomas Sjögren
ceb516fc29 Merge pull request #198 from konstruktoid/pr182_output
#182 output formating
2017-01-23 16:16:47 +01:00
Thomas Sjögren
933f1b6da9 output formating
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-23 16:16:02 +01:00
Thomas Sjögren
00b45ef205 Merge pull request #196 from konstruktoid/pr182_net
#182 netstat
2017-01-23 13:39:36 +01:00
Thomas Sjögren
7aa4682c87 #182 netsat
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-23 13:38:28 +01:00
Thomas Sjögren
a5f48da9f2 Merge pull request #195 from konstruktoid/pr182_checks
#182 checks
2017-01-23 13:14:45 +01:00
Thomas Sjögren
95e6ac8253 #182 checks
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-23 13:13:48 +01:00
Thomas Sjögren
fc30bdaf55 Merge pull request #194 from konstruktoid/pr182_legacy
#182 remove legacy code
2017-01-23 12:53:31 +01:00
Thomas Sjögren
07dbba6400 #182 remove legacy code
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-23 12:52:31 +01:00
Thomas Sjögren
eb2e81ae17 Merge pull request #193 from konstruktoid/pr182_messages
#182 messages and syntax
2017-01-23 12:41:26 +01:00
Thomas Sjögren
6a2176b34e #182 messages and syntax
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-23 12:40:32 +01:00
Thomas Sjögren
200152dff1 Merge pull request #182 from vadapalliravikumar/docker-benchmark-1.12.0
Support for 'CIS Docker Benchmark 1.12.0'
2017-01-23 12:16:06 +01:00
Thomas Sjögren
27773128f8 Merge branch 'master' into docker-benchmark-1.12.0 2017-01-23 12:14:23 +01:00
Thomas Sjögren
ab32cb3e12 Merge pull request #192 from konstruktoid/readme_112
1.12 benchmark
2017-01-23 12:05:48 +01:00
Thomas Sjögren
a91d2fca56 1.12 benchmark
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-23 12:05:01 +01:00
Maik Ellerbrock
1745cc16bb
refactor(docker): update main dockerfile (copy files directly)
Signed-off-by: Maik Ellerbrock <opensource@frapsoft.com>
2017-01-22 01:02:26 +01:00
Thomas Sjögren
a36be342c0 Merge pull request #191 from konstruktoid/redirect
correct redirect
2017-01-21 21:35:27 +01:00
Thomas Sjögren
88c10c164e correct redirect
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-21 21:34:59 +01:00
Maik Ellerbrock
dcecae29e9
fix(bash): update bash script to fix exec from another dir prob
Signed-off-by: Maik Ellerbrock <opensource@frapsoft.com>
2017-01-20 20:00:32 +01:00
Maik Ellerbrock
562e38da7c
fix(docker): add workdir to dockerfile
Signed-off-by: Maik Ellerbrock <opensource@frapsoft.com>
2017-01-20 19:42:23 +01:00
Thomas Sjögren
c5355d793b Merge pull request #190 from konstruktoid/mdlint
markdown lint
2017-01-20 12:27:09 +01:00
Thomas Sjögren
2204534b20 markdown lint
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-20 12:25:56 +01:00
Thomas Sjögren
83214e76b0 Merge pull request #189 from konstruktoid/issue_164
Fixes #164
2017-01-20 12:17:37 +01:00
Thomas Sjögren
d617e9ba57 Fixes #164
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-20 12:16:50 +01:00
Thomas Sjögren
b3cd7a1755 Merge pull request #168 from MrSecure/fix-tls-verify
Fixes #167 - use get_docker_cumulative_command_line_args to check TLS
2017-01-20 12:08:12 +01:00
Thomas Sjögren
d3103c4309 Merge pull request #188 from konstruktoid/version
1.13.0
2017-01-20 11:54:08 +01:00
Thomas Sjögren
91e684da65 1.13.0
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-20 11:53:18 +01:00
Maik Ellerbrock
d468e23f48
build(docker): add docker best practices
Signed-off-by: Maik Ellerbrock <opensource@frapsoft.com>
2017-01-20 02:47:17 +01:00
Thomas Sjögren
7878276f04 Merge pull request #186 from konstruktoid/1126
CVE-2016-9962
2017-01-11 15:49:06 +01:00