Commit graph

29 commits

Author SHA1 Message Date
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
Thomas Sjögren
261e3f2611 update version yell
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2019-08-28 12:43:06 +02:00
Thomas Sjögren
dfccc21a18 prettier yell output
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2018-05-10 15:47:23 +02:00
Thomas Sjögren
11230d052e formatting
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2018-05-10 15:41:27 +02:00
Thomas Sjögren
6c0dce7b19 yell function and version varible
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2018-05-10 15:19:10 +02:00
Thomas Sjögren
dc369a6bad move audit rules default path variable
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2018-01-16 13:46:08 +01:00
Thomas Sjögren
91e625b8e4 Modify get_docker_configuration_file_args in order to handle daemon.json better,
and also address missing files issue.

Closes #231
Closes #232

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-03-21 14:49:42 +01:00
Thomas Sjögren
65ff6d1015 null if no config file
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-02-23 16:33:54 +01:00
Thomas Sjögren
072ff1cce3 fallback to default daemon.json
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-02-23 16:33:54 +01:00
Thomas Sjögren
7410cdf9f6 add get_docker_configuration_file_args
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-02-23 16:33:53 +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
88c10c164e correct redirect
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-01-21 21:34:59 +01: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
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
Dhawal Patel
a8cc89ce70 fix early-docker issue by selecting newest docker daemon process
Signed-off-by: Dhawal Patel <dhawal.patel@nordstrom.com>
2016-06-29 12:48:32 -07:00
Thomas Sjögren
4e414f51ef check /etc/systemd/system/ before systemctl, /usr/lib/systemd/ fallback
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-12-14 20:27:10 +01:00
Thomas Sjögren
e19f997b3f if systemctl show fails, use /usr/lib/systemd/system/ path
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-12-12 16:57:40 +01:00
Thomas Sjögren
e5f15e216d get the systemd service file
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-11-27 19:25:14 +01:00
Andreas Stieger
49f78d715a In preparation to fixing #99, normalize different methods of quoting to no quoting
Signed-off-by: Andreas Stieger <astieger@suse.com>
2015-11-17 16:34:37 +01:00
Andreas Stieger
ef81ec7a47 Add helper functions in preparation of fixing #97, #98, #99
get_docker_cumulative_command_line_args: new
get_docker_effective_command_line_args: new

Signed-off-by: Andreas Stieger <astieger@suse.com>
2015-11-17 16:34:33 +01:00
Andreas Stieger
3b6a0d1a6e Documentation fix for get_command_line_args
pgrep is run with -o, returning only the oldest process, usually the daemon.
Adjust function comment. TODO: read from PID file

Signed-off-by: Andreas Stieger <astieger@suse.com>
2015-11-17 14:56:34 +01: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
Joachim Lusiardi
2d29af704e Improve fix for issue 47 using prep -x -o
The use of `pgrep -x`was proposed by @rnelson0. `pgrep -x -o` should limit the result to the oldest exactly matching execution of a binary called `docker`.

Signed-off-by: Joachim Lusiardi <joachim@lusiardi.de>
2015-06-29 22:28:14 +02:00
Joachim Lusiardi
fc8eefb8a6 Fix for issue #47.
Introduces a new function in helper_lib.sh to query the command line
arguments of the running instances of a binary. This is done to get
rid of the problem of "-lf" versus "-alf" for pgrep.

Signed-off-by: Joachim Lusiardi <joachim@lusiardi.de>
2015-06-29 22:27:34 +02: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
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
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
Diogo Monica
03ac3f5bd3 Make ifs style be consistent 2015-05-14 20:26:32 -07:00
Diogo Monica
18d5a13240 First version of the CIS Docker Benchmark v1.0.0 2015-05-13 15:26:45 -07:00