Commit graph

898 commits

Author SHA1 Message Date
Thomas Sjögren
41593e80d0
Merge pull request #439 from roman-mueller/fix_description
Remove prefix of check ID in description
2020-06-02 14:10:21 +00:00
Roman Mueller
b3182ca8f5 Remove prefix of check ID 2020-06-02 15:57:33 +02:00
Thomas Sjögren
d6969dd2a4
Merge pull request #438 from konstruktoid/alpine
alpine:3.12
2020-06-01 07:31:05 +00:00
Thomas Sjögren
aa984c44db alpine:3.12
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2020-06-01 09:30:09 +02:00
Thomas Sjögren
1e0a10b71f
Merge pull request #436 from konstruktoid/macnetstat
more flexible binary usage, better support for mac os
2020-05-08 11:10:57 +00:00
Thomas Sjögren
8aec461d46 more flexible binary usage, better support for mac os
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2020-05-08 13:09:52 +02:00
Thomas Sjögren
375d32c0db
Merge pull request #435 from konstruktoid/scoring
map desc_ to benchmark headings
2020-05-08 10:41:41 +00:00
Thomas Sjögren
98acc66436 map desc_ to benchmark headings
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2020-05-08 12:38:08 +02:00
Thomas Sjögren
735938a8f1
Merge pull request #434 from HristoStoyanovMM/CIS_Level1_only_checks
Add CIS Level 1 only functions
2020-05-08 08:46:28 +00:00
herc1
4612146563 Add CIS Level 1 only functions
Signed-off-by: HristoStoyanovMM <hristo.stoyanov@mentormate.com>
2020-05-07 19:44:56 +03:00
Thomas Sjögren
79ef925df1
Merge pull request #430 from konstruktoid/ISSUE422b
by an appropriate
2020-04-17 11:12:51 +00:00
Thomas Sjögren
5210cc9ff9 by an appropriate
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2020-04-17 13:11:37 +02:00
Thomas Sjögren
d32d4f3ce3
Merge pull request #429 from konstruktoid/ISSUE422
fix MacOSX volume, and lint
2020-04-17 06:26:30 +00:00
Thomas Sjögren
1c2b912aa2 fix MacOSX volume, and lint
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2020-04-17 08:25:44 +02:00
Thomas Sjögren
d53ac42de1
Merge pull request #428 from konstruktoid/ISSUE424
update README, correct volume binary paths
2020-04-16 15:18:38 +00:00
Thomas Sjögren
3c38419c5b update README, correct volume binary paths
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2020-04-16 17:17:51 +02:00
Thomas Sjögren
2cdfa3df25
Merge pull request #423 from illyaMs/master
[Ubuntu] Fix issue with docker.service and docker.socket files not found
2020-04-15 09:05:50 +00:00
Thomas Sjögren
2972b685fc
Merge pull request #427 from konstruktoid/ISSUE425
use opensuse/leap, and remove awk linkage
2020-04-15 08:55:27 +00:00
Thomas Sjögren
9f92e46df8 use opensuse/leap, and remove awk linkage
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2020-04-15 10:54:17 +02:00
Ilya Dus
51bc75eb55 fix(docs): explain the need of mounting /lib/systemd/system folder for Ubuntu
Signed-off-by: Ilya Dus <ilyadoos@gmail.com>
2020-04-10 16:27:32 +03:00
Ilya Dus
d42fedc370 fix(sh): check default ubuntu locations of docker.service and docker.socket files
Signed-off-by: Ilya Dus <ilyadoos@gmail.com>
2020-04-10 16:26:25 +03:00
Thomas Sjögren
0307da4c61
Merge pull request #421 from konstruktoid/issue158
macOS user instructions. ref #158
2020-04-01 13:20:41 +02:00
Thomas Sjögren
b3488e7d1f macOS user instructions. ref #158
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2020-04-01 13:19:55 +02:00
Thomas Sjögren
937ec4958a
Merge pull request #419 from zawazawa0316/fix_5
Fix check conditions
2020-03-09 14:54:32 +00:00
zawazawa0316
33566331d1 fix line 230
Signed-off-by: zawazawa0316 <37421794+zawazawa0316@users.noreply.github.com>
2020-03-09 23:48:10 +09:00
zawazawa0316
b046f930bc remove single space at line 230
Signed-off-by: zawazawa0316 <37421794+zawazawa0316@users.noreply.github.com>
2020-03-09 23:45:25 +09:00
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
e1feca8620
Merge pull request #417 from zawazawa0316/fix_2_5
Fix check condition
2020-03-03 14:04:32 +00:00
zawazawa0316
b16da2c2ed Fix check condition
Signed-off-by: zawazawa0316 <37421794+zawazawa0316@users.noreply.github.com>
2020-03-03 21:51:49 +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