Commit graph

261 commits

Author SHA1 Message Date
Thomas Sjögren
1655718e12 Merge pull request #79 from konstruktoid/logoutput
write init date to output file as well
2015-09-05 15:46:22 +02:00
Thomas Sjögren
151bb6d16f write init date to output file as well
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-09-05 15:44:44 +02:00
Thomas Sjögren
a010128ed2 Merge pull request #78 from jumanjiman/usage
improve CLI option handling
2015-09-05 15:33:56 +02:00
Paul Morgan
085b260a7b exit with proper status on CLI options
* if `-h` is used: exit good
* if a non-valid CLI option is used without `-h`: exit bad

Signed-off-by: Paul Morgan <jumanjiman@gmail.com>
2015-09-04 21:13:05 -04:00
Paul Morgan
aaffcb8df1 show logging option when user asks for help
* avoid printf to simplify usage() syntax
* add reminder to update usage() when CLI option is added
* preserve indentation for help output

Signed-off-by: Paul Morgan <jumanjiman@gmail.com>
2015-09-04 21:13:05 -04:00
Paul Morgan
ed6b0fa348 remove unused CLI options
* -f is not used in `getopts`
* -i is not used in `getopts`
* -l needs trailing `:` to mandate `path/to/log/file`
* leading `:` is unnecessary in standard shell

Signed-off-by: Paul Morgan <jumanjiman@gmail.com>
2015-09-04 19:24:25 -04:00
Thomas Sjögren
a1d9a18400 Merge pull request #77 from csabapalfi/refactor_process_count_check
Make process count check a bit easier to read
2015-08-17 19:43:06 +02:00
Csaba Palfi
831a373a61 make process count check even simpler
Signed-off-by: Csaba Palfi <csaba@palfi.me>
2015-08-17 17:41:47 +01:00
Csaba Palfi
d7926a0f31 make process count check a bit easier to read
Signed-off-by: Csaba Palfi <csaba@palfi.me>
2015-08-17 17:29:42 +01:00
Thomas Sjögren
1566929f87 Merge pull request #75 from konstruktoid/jessie
switch to jessie
2015-08-13 22:39:03 +02:00
Thomas Sjögren
f4e5cfd7df Merge pull request #76 from konstruktoid/prettier_output
prettier Docker exec fail output
2015-08-13 22:38:51 +02:00
Thomas Sjögren
930f7ea676 switch to jessie
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-08-13 22:35:50 +02:00
Thomas Sjögren
75a7f955cc prettier Docker exec fail output
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-08-13 22:06:03 +02:00
Thomas Sjögren
1c217b85be Merge pull request #74 from konstruktoid/filter_nil
'CapAdd=<nil>'
2015-08-13 21:47:50 +02:00
Thomas Sjögren
5f4bfdb98c 'CapAdd=<nil>'
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-08-13 21:46:21 +02:00
Thomas Sjögren
3610c6387e Merge pull request #73 from konstruktoid/version
current version is 1.8.0
2015-08-13 21:36:47 +02:00
Thomas Sjögren
64bc5323e6 current version is 1.8.0
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-08-13 21:35:55 +02:00
Diogo Mónica
8940c404fa Changing to official docker hub image 2015-08-12 21:43:01 -07:00
Thomas Sjögren
739c16f6bf Merge pull request #71 from iangelov/master
Count unique image ids only.
Closes #70
2015-08-10 23:31:35 +02:00
Ivan Angelov
7ada35cd90 Count unique image ids only
Signed-off-by: Ivan Angelov <iangelov@users.noreply.github.com>
2015-08-10 17:19:06 +02:00
Thomas Sjögren
3571e2738e Merge pull request #69 from petersellars/master
Fix filtering out docker-bench-security container from results.
2015-08-05 22:49:41 +02:00
Pete Sellars
57ac3cee99 Fix filtering out docker-bench-security container from results
Signed-off-by: Pete Sellars <psellars@gmail.com>
2015-08-05 22:15:22 +12:00
Thomas Sjögren
3e6636c044 Merge pull request #67 from konstruktoid/typo
typo
2015-08-03 23:51:04 +02:00
Thomas Sjögren
ad5673d2fd typo
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-08-03 23:49:30 +02:00
Thomas Sjögren
c1201a1905 Merge pull request #66 from konstruktoid/issue_65
Mention the distros directory. Issue #65
2015-07-31 00:13:30 +02:00
Thomas Sjögren
ba438ec555 Mention the distros directory. Issue #65
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-07-30 23:14:23 +02:00
Thomas Sjögren
cbb6c97826 Merge pull request #64 from docker/diogo-small-label-nit
Changing description to match label
2015-07-26 00:39:55 +02:00
Diogo Mónica
c1a55e80fc Merge pull request #63 from konstruktoid/label
label rule for 1.8
2015-07-25 10:07:52 -07:00
Thomas Sjögren
f205d27f93 Merge pull request #62 from konstruktoid/alpine_docker
alpine 3.1 uses docker 1.4
2015-07-25 18:18:50 +02:00
Thomas Sjögren
815b369237 label rule for 1.8
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-07-25 14:20:56 +02:00
Thomas Sjögren
ccd574bf7b alpine 3.1 uses docker 1.4
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-07-25 14:13:21 +02:00
Thomas Sjögren
887f5a4e34 Merge pull request #61 from amegianeg/get_container_names
LGTM.
Get all running containers by name instead of by shor-uuid.
2015-07-25 14:04:48 +02:00
Diogo Monica
45f0b049ff Changing description to match label
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-07-24 22:08:14 -07:00
alberto
de68752f30 Get all running containers by name instead of by shor-uuid to improve readability in logs
Signed-off-by: alberto <alberto@tutum.co>
2015-07-23 11:31:23 +02:00
Thomas Sjögren
ec3fdfce3a Merge pull request #60 from konstruktoid/version_fix
catch server versions
2015-07-11 20:42:26 +02:00
Thomas Sjögren
45671a70f3 catch server versions
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-07-11 20:36:04 +02:00
Thomas Sjögren
4a289d9a15 Merge pull request #59 from konstruktoid/perm_checks
Perm checks
2015-07-10 02:11:10 +02:00
Thomas Sjögren
6fca0428e7 missed one tls*
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-07-10 02:10:26 +02:00
Thomas Sjögren
056768e78d Merge pull request #58 from konstruktoid/version
handle -dev version
2015-07-10 01:52:01 +02:00
Thomas Sjögren
b3fd225df8 fix incorrect file variables
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-07-10 01:43:11 +02:00
Thomas Sjögren
8b0efa170f split cmdline
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-07-10 01:30:38 +02:00
Thomas Sjögren
3c6b0df012 handle -dev version
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-07-10 00:40:31 +02:00
Thomas Sjögren
79ddbebcd4 Merge pull request #55 from fatherlinux/master
Created customized Dockerfiles for RHEL and CentOS
2015-07-06 21:40:55 +02:00
Scott McCarty
9429cdd79f Changed the repository to my fork fatherlinux/docker-bench-security
Signed-off-by: Scott McCarty <smccarty@redhat.com>
2015-07-06 13:07:07 -04:00
Thomas Sjögren
c02b1f5da9 Merge pull request #56 from konstruktoid/shellcheck
shellcheck
2015-07-04 00:07:23 +02:00
Thomas Sjögren
675bbc84db shellcheck
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-07-04 00:05:13 +02:00
Scott McCarty
b942031979 Created customized Dockerfiles for RHEL and CentOS
Signed-off-by: Scott McCarty <smccarty@redhat.com>
2015-07-02 14:23:58 -04:00
Thomas Sjögren
10ecf0282c Merge pull request #53 from konstruktoid/dockerfile_order
Dockerfile order
2015-07-01 21:05:04 +02:00
Thomas Sjögren
dbb8b8067e Merge pull request #54 from konstruktoid/distros_debian
Add Debian Dockerfile
2015-07-01 21:03:28 +02:00
Thomas Sjögren
f3d9b5cc2e Use distros/Dockerfile.alpine
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-07-01 21:00:51 +02:00