Commit graph

462 commits

Author SHA1 Message Date
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
Thomas Sjögren
31cf7c9285 CVE-2016-9962
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-11 15:32:05 +01:00
Thomas Sjögren
46364b429f Merge pull request #185 from konstruktoid/v1126
1.12.6
2017-01-11 11:45:56 +01:00
Thomas Sjögren
67c7562937 1.12.6
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-11 11:44:37 +01:00
Thomas Sjögren
149f2ce8d0 Merge pull request #184 from konstruktoid/alpine_35
use alpine 3.5
2017-01-11 09:34:31 +01:00
Thomas Sjögren
0a10dde3c0 use alpine 3.5
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-11 09:26:28 +01:00
Ravi Kumar Vadapalli
6aae32f4e5 Support for 'CIS Docker Benchmark 1.12.0'
Signed-off-by: Ravi Kumar Vadapalli <vadapalli.ravikumar@gmail.com>
2016-12-20 20:31:58 +05:30
Thomas Sjögren
338f35bf36 Merge pull request #181 from konstruktoid/labels
replace maintainer, repository with labels
2016-12-20 11:43:45 +01:00
Thomas Sjögren
71b6ce8b0a replace maintainer, repository with labels
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-12-20 11:41:46 +01:00
Thomas Sjögren
1582d8bcca Merge pull request #180 from konstruktoid/version_1125
current version in 1.12.5
2016-12-16 09:18:22 +01:00
Thomas Sjögren
27bb58c5cb current version in 1.12.5
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-12-16 09:17:41 +01:00
Thomas Sjögren
6f5fbd1d65 Merge pull request #179 from konstruktoid/version_1124
docker version 1.12.4
2016-12-13 08:34:51 +01:00
Thomas Sjögren
2f6ddfd500 docker version 1.12.4
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-12-13 08:34:01 +01:00
Thomas Sjögren
63d4c09b1f Merge pull request #178 from konstruktoid/issue_177
use debian:sid for docker.io
2016-12-02 15:59:28 +01:00
Thomas Sjögren
09335befba use debian:sid for docker.io
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-12-02 15:56:28 +01:00
Thomas Sjögren
f986d72a05 Merge pull request #176 from konstruktoid/version_1123
bump version to 1.12.3
2016-10-27 11:41:43 +02:00
Thomas Sjögren
7d4ee87105 bump version to 1.12.3
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-10-27 11:40:55 +02:00
Thomas Sjögren
c28ffea405 Merge pull request #173 from konstruktoid/dockerd
add support for dockerd
2016-10-13 22:51:19 +02:00
Thomas Sjögren
325178284a add support for dockerd
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-10-13 22:50:24 +02:00
Thomas Sjögren
84a764e3d8 Merge pull request #169 from kevinll/master
fix test 2.2 check for log level
Close #166
2016-10-13 22:26:56 +02:00
Thomas Sjögren
0d11e2a9c5 Merge pull request #172 from konstruktoid/version
1.12.2
2016-10-13 22:16:15 +02:00
Thomas Sjögren
e45d4e3bb8 1.12.2
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-10-13 22:15:35 +02:00
Kevin Lim
89e4769877 fix test 2.2 check for log level
Signed-off-by: Kevin Lim <kevin.lim@sap.com>
2016-09-28 14:25:42 -07:00
Mr. Secure
ee3e8dedb3 Fixes #167 - use get_docker_cumulative_command_line_args to check TLS settings
Additionally, split warning into 2 parts:  no TLS, TLS w/o verification

Signed-off-by: Mr. Secure <ben.github@mrsecure.org>
2016-09-24 19:42:39 -05:00
Thomas Sjögren
5bf3e2894c Merge pull request #165 from konstruktoid/version
1.12.1
2016-08-19 23:11:35 +02:00
Thomas Sjögren
adfee878b8 1.12.1
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-08-19 23:11:03 +02:00
Thomas Sjögren
2428b33af8 Merge pull request #163 from kevinll/patch-1
Update helper_lib.sh
2016-08-11 21:57:55 +02:00
kevinll
771dfe8f46 Update helper_lib.sh
Update function comment for current code..

Signed-off-by: Kevin Lim <kevin.lim@sap.com>
2016-08-08 14:28:11 -07:00
Thomas Sjögren
696d3f2a77 Merge pull request #162 from konstruktoid/issue_161
Issue 161
2016-07-29 20:32:34 +02:00
Thomas Sjögren
15dc14ce3e bump minor version, closes #161
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-07-29 20:30:11 +02:00