Commit graph

513 commits

Author SHA1 Message Date
Thomas Sjögren
1f499387c6 fallback to default daemon.json
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-02-21 11:49:06 +01:00
Thomas Sjögren
03f5088d08 get file locations from config file
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-02-20 11:22:01 +01:00
Thomas Sjögren
cda18f31a5 check config file settings
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-02-20 11:21:18 +01:00
Thomas Sjögren
bfcc4ec4b8 add get_docker_configuration_file_args
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-02-20 11:20:41 +01:00
Thomas Sjögren
48563f837a Merge pull request #217 from konstruktoid/code_clean
remove code, if CMD instead of exit code
2017-02-17 15:10:37 +01:00
Thomas Sjögren
7d992029e6 remove code, if CMD instead of exit code
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-02-17 15:03:29 +01:00
Thomas Sjögren
2de8e71d01 Merge pull request #216 from konstruktoid/issue_212
replace contains with grep
2017-02-15 15:12:25 +01:00
Thomas Sjögren
bd236b1ac0 add host / as sensitive
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-02-13 11:36:16 +01:00
Thomas Sjögren
e78f1b8045 replace contains with grep
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-02-10 15:35:06 +01:00
Thomas Sjögren
7eeb6890ff Merge pull request #215 from konstruktoid/alpine_apk
apk upgrade
2017-01-31 14:31:55 +01:00
Thomas Sjögren
c1c12e9659 distros/Dockerfile
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-31 14:31:28 +01:00
Thomas Sjögren
4d3686cb05 apk upgrade
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-31 14:29:57 +01:00
Thomas Sjögren
5e4d4304b5 Merge pull request #214 from konstruktoid/code_fixes
Code fixes
2017-01-27 11:01:48 +01:00
Thomas Sjögren
4e126efdbb 5.25 check correction
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-27 11:00:36 +01:00
Thomas Sjögren
6c35842734 5.19 check correction
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-27 11:00:25 +01:00
Thomas Sjögren
7fc5dc33a7 sh if lint
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-27 10:59:57 +01:00
Thomas Sjögren
c36649362b Merge pull request #211 from konstruktoid/documentation
md lint and use labels
2017-01-26 14:57:06 +01:00
Thomas Sjögren
cc98e55b9d md lint and use labels
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-26 14:53:47 +01:00
Thomas Sjögren
8fdb514dba Merge pull request #187 from ellerbrock/best-practices
build(docker): add docker best practices
2017-01-26 14:29:50 +01:00
binary
4535d08967 refactor(docker): update Dockerfile.alpine to latest version
Signed-off-by: binary <binary@webdev.fritz.box>
2017-01-26 12:10:19 +01:00
Thomas Sjögren
30e9089c50 Merge pull request #210 from konstruktoid/image
less ugly image
2017-01-26 10:18:24 +01:00
Thomas Sjögren
c1f07f5539 less ugly image
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-26 10:15:38 +01:00
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