Commit graph

54 commits

Author SHA1 Message Date
Diogo Monica
ebcbf9a231 Add first version of CONTRIBUTING.md 2015-06-11 16:26:49 -07:00
Diogo Mónica
67711b52d3 Merge pull request #27 from konstruktoid/issue_24
Issue #24, remove -U, -u
2015-06-10 18:29:29 -07:00
Diogo Mónica
eed841c201 Merge pull request #23 from jfrazelle/make-executable
Make the main script an executable for if I want to run it on my host
2015-06-10 18:25:33 -07:00
Thomas Sjögren
2d25ddbcaf Issue #24, remove -U, -u
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-06-11 02:35:54 +02:00
Jessica Frazelle
b24a9d15b9 use official alpine image as the base
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-09 00:11:03 -07:00
Jessica Frazelle
0231a7f5de Make the main script an executable for if I want to run it on my host
Fix image sprawl to work

Fix port range

Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-09 00:10:44 -07:00
Diogo Mónica
d48d691ec2 Merge pull request #18 from konstruktoid/misc
docker version, correct number of images, clean 2.7 output, ...
2015-06-01 15:57:04 -07:00
Diogo Mónica
645cb34a75 Merge pull request #16 from konstruktoid/clean_ps
remove unused ps_ variables
2015-06-01 15:56:46 -07:00
Thomas Sjögren
b6a4bd7504 dont echo the grep result
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-06-01 22:51:47 +02:00
Thomas Sjögren
2e92ed5a01 exec_check had extra space
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-06-01 22:46:58 +02:00
Thomas Sjögren
787f4325b2 update 5.7 exec_check to new style
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-06-01 22:44:37 +02:00
Thomas Sjögren
e29a886254 warn if only -lt half of the images are in use
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-06-01 22:37:28 +02:00
Thomas Sjögren
8ff1dc25ee docker_version variable
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-06-01 22:36:55 +02:00
Thomas Sjögren
9cccfa6902 get the correct number of images
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-06-01 22:20:03 +02:00
Diogo Mónica
2700ef95ba Taking read-only out
Mounting `/etc:ro` was causing issues in OpenSuse and Centos 5.6
2015-06-01 09:16:17 -07:00
Thomas Sjögren
d49a192c19 remove unused ps_ variables
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-06-01 00:25:08 +02:00
Diogo Mónica
362c62ac6e Merge pull request #3 from wernerb/shellcheck
Shellcheck
2015-05-31 10:31:53 -07:00
Werner Buck
f4aab9c8c5 Double quote to prevent globbing and word splitting.
Do not use legacy backticks.
Proper use of printf
Do not use wc -l with grep, instead use grep -c
Use pgrep

Signed-off-by: Werner Buck <wernerbuck@gmail.com>
2015-05-31 12:26:37 +02:00
Diogo Mónica
54202b3b41 Merge pull request #14 from konstruktoid/split_pr
Split PR #12 into separate commits
2015-05-30 16:45:12 -07:00
Thomas Sjögren
4fcac56d34 add /usr/sbin/
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-05-31 01:40:23 +02:00
Thomas Sjögren
9a35eb97d1 add /usr/local/bin to PATH
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-05-31 01:20:38 +02:00
Diogo Mónica
85370b4530 Merge pull request #1 from paulczar/paulczar-patch-1
Update README.md
2015-05-30 14:01:56 -07:00
Thomas Sjögren
643beee453 fail=1 when Docker exec fails
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-05-30 13:03:01 +02:00
Thomas Sjögren
d964e084fc no need for cat when grepping
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-05-30 13:02:37 +02:00
Thomas Sjögren
d02a7f8c0e Add Docker do_version_check
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-05-30 13:02:08 +02:00
Thomas Sjögren
7082102612 add ps variable and limit output to root
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-05-30 13:01:19 +02:00
Thomas Sjögren
32bdece6ac restrictive PATH
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-05-30 13:00:29 +02:00
Thomas Sjögren
01c915485e add .dockerignore
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-05-30 12:59:22 +02:00
Paul Czarkowski
e5a5d1fc9c Update README.md
document mounting volumes to container as read only.

Signed-off-by: Paul Czarkowski <username.taken@gmail.com>
2015-05-29 15:13:21 -05:00
Diogo Mónica
26912d9047 Merge pull request #4 from crosbymichael/fix-copyright
Fix unpopulated copyright in license
2015-05-29 11:20:06 -07:00
Michael Crosby
8d36d81bfa Fix unpopulated copyright in license
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-29 11:12:47 -07:00
Diogo Mónica
34c784dcbf Update README.md 2015-05-27 15:26:23 -07:00
Diogo Mónica
66e7fc9ec6 Small tweaks to README 2015-05-27 15:24:26 -07:00
Diogo Mónica
9a6e841f5b Updating Readme 2015-05-27 15:10:09 -07:00
Diogo Monica
a4cd4aa511 Rename to docker-bench-security 2015-05-27 15:08:25 -07:00
Diogo Monica
4194b1e65c Adding double quotes to 2015-05-25 20:31:46 -07:00
Diogo Monica
aa24306b04 Rename to docker-bench 2015-05-25 20:21:45 -07:00
Diogo Mónica
e1e8eb24b9 Update README 2015-05-14 20:33:02 -07:00
Diogo Mónica
f8f5819822 Updated README 2015-05-14 20:31:08 -07:00
Diogo Monica
03ac3f5bd3 Make ifs style be consistent 2015-05-14 20:26:32 -07:00
Diogo Monica
d6c1443641 Revert "Adding CNAME file"
This reverts commit 187bf9906c.
2015-05-14 16:56:10 -07:00
Diogo Monica
be18328e75 Merge branch 'master' of https://github.com/diogomonica/docker-security-benchmark 2015-05-14 16:51:35 -07:00
Diogo Monica
187bf9906c Adding CNAME file 2015-05-14 16:51:28 -07:00
Diogo Mónica
edf562f080 Changed README with Docker 1.6 requirement. 2015-05-14 15:51:55 -07:00
Diogo Mónica
fc99d5c9f6 Adding screenshot to readme 2015-05-14 14:34:03 -07:00
Diogo Monica
6beb8f274f Adding screenshot 2015-05-14 14:32:46 -07:00
Diogo Monica
2af45c6281 Added License 2015-05-14 09:25:54 -07:00
Diogo Monica
8d06000296 Fixed running containers calculation 2015-05-13 19:43:12 -07:00
Diogo Monica
1c795f146e Added filtering to ignore security-benchmark container 2015-05-13 19:22:39 -07:00
Diogo Monica
1cd54124c7 Updated Readme to reflect --label need 2015-05-13 17:10:50 -07:00