Cheng-Li Jerry Ma 
								
							 
						 
						
							
							
								
							
							
	a46b6500af  
						 
						
							
							
								
								
								Fix missing check_7_4  
							
							 
							
							... 
							
							
							
							Signed-off-by: Cheng-Li Jerry Ma <chengli.ma@gmail.com> 
							
						 
						
							2018-11-09 09:47:41 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	a9caef9eb6 
 
						 
						
							
							
								
								
								Merge pull request  #339  from ellerbrock/master  
							
							 
							
							... 
							
							
							
							Update Alpine Linux to Version 3.8 (latest) 
							
						 
						
							2018-11-07 11:40:15 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maik Ellerbrock 
								
							 
						 
						
							
							
								
							
							
	
	
	af334986e1 
 
						 
						
							
							
								
								
								build(update alpine linux to version 3.8):  
							
							 
							
							... 
							
							
							
							Signed-off-by: Maik Ellerbrock <opensource@frapsoft.com> 
							
						 
						
							2018-11-07 10:20:45 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	bcd1c22845 
 
						 
						
							
							
								
								
								Merge pull request  #338  from konstruktoid/lint  
							
							 
							
							... 
							
							
							
							Lint 
							
						 
						
							2018-11-01 11:07:34 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	75c8f3d2da  
						 
						
							
							
								
								
								cleanup  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-11-01 11:05:52 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	391e09f76a  
						 
						
							
							
								
								
								linting  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-11-01 10:24:36 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	4725582a0c 
 
						 
						
							
							
								
								
								Merge pull request  #337  from konstruktoid/issue321  
							
							 
							
							... 
							
							
							
							load dependencies in correct order 
							
						 
						
							2018-10-25 12:06:52 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	eb9ea59fe5  
						 
						
							
							
								
								
								load dependencies in correct order  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-10-25 12:05:48 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	d45081bd1a 
 
						 
						
							
							
								
								
								Merge pull request  #336  from konstruktoid/issue321  
							
							 
							
							... 
							
							
							
							Issue321 
							
						 
						
							2018-10-25 11:42:27 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	1647e47976  
						 
						
							
							
								
								
								update README  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-10-25 11:39:35 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	2cbfd83f53  
						 
						
							
							
								
								
								add nocolor option  #321  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-10-25 11:34:14 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	9dd2fa5ce0 
 
						 
						
							
							
								
								
								Merge pull request  #335  from konstruktoid/issue330  
							
							 
							
							... 
							
							
							
							sed option extravaganza #330  
							
						 
						
							2018-10-25 08:48:07 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	e84e9e52e0 
 
						 
						
							
							
								
								
								Merge pull request  #333  from konstruktoid/issue332  
							
							 
							
							... 
							
							
							
							use mountpoint and DockerRootDir #332  
							
						 
						
							2018-10-25 08:47:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	6789403599 
 
						 
						
							
							
								
								
								Merge pull request  #328  from konstruktoid/issue286  
							
							 
							
							... 
							
							
							
							add include option #286  
							
						 
						
							2018-10-25 08:47:04 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	afa289d9b7  
						 
						
							
							
								
								
								sed option extravaganza  #330  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-10-24 10:01:27 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	d5b900ce05  
						 
						
							
							
								
								
								use mountpoint and DockerRootDir  #332  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-10-23 15:26:41 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	1721253616 
 
						 
						
							
							
								
								
								Merge pull request  #331  from konstruktoid/issue330  
							
							 
							
							... 
							
							
							
							update README #330  
							
						 
						
							2018-10-23 12:17:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	704471c52d  
						 
						
							
							
								
								
								update README  #330  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-10-23 12:16:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	36b73c4398  
						 
						
							
							
								
								
								add include option  #286  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-10-15 16:21:00 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	9ca5b8b2e1 
 
						 
						
							
							
								
								
								Merge pull request  #314  from draios/master  
							
							 
							
							... 
							
							
							
							Improve docker-bench-security json output 
							
						 
						
							2018-10-12 12:27:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Stemm 
								
							 
						 
						
							
							
								
							
							
	ec7d8ce690  
						 
						
							
							
								
								
								Improve docker-bench-security json output  
							
							 
							
							... 
							
							
							
							Add a test object for each test performed by the script. Each object has
an id N.M, a desc property describing the test, and the result. Some
tests include additional information about the test e.g. "No TLS
Certificate Found". That can be found in an optional details property of
the test object.
Also, some tests might also return a list of containers, images, users,
etc. This is included in an optional items property of the test object.
Instead of having all test results as top-level objects, break the test
results into sections. Each section has an id + description e.g. "1" and
"Host Configuration". The tests for that section are an array below that
object.
All of the additional json output is implemented by adding new functions
startsectionjson(), endsectionjson(), starttestjson(), and
resulttestjson() that take the id/desc/etc as arguments and print the
proper json properties. It also required adding an "end" test to each
script that calls endsectionjson().
Signed-off-by: Mark Stemm <mark.stemm@gmail.com> 
							
						 
						
							2018-10-11 13:39:55 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	bbf43c88e1 
 
						 
						
							
							
								
								
								Merge pull request  #326  from konstruktoid/issu325  
							
							 
							
							... 
							
							
							
							ref #325  daemon.json permissions 
							
						 
						
							2018-09-27 09:51:02 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	773625a894  
						 
						
							
							
								
								
								ref  #325  daemon.json permissions  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-09-27 09:49:32 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	feced0f6b2 
 
						 
						
							
							
								
								
								Merge pull request  #313  from nbrownuk/issue295-fix-tls-config-check  
							
							 
							
							... 
							
							
							
							Fixes incorrect reporting of TLS configuration in test 2.6 
							
						 
						
							2018-08-08 11:58:47 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	dbe0ada203 
 
						 
						
							
							
								
								
								Merge pull request  #322  from konstruktoid/ISSUE316  
							
							 
							
							... 
							
							
							
							dont decrease 5.29 #316  
							
						 
						
							2018-08-06 09:51:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	f1137cd36a  
						 
						
							
							
								
								
								dont decrease 5.29  #316  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-08-06 09:51:06 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	b408fb3e86 
 
						 
						
							
							
								
								
								Merge pull request  #317  from joewilliams/joewilliams-patch-1  
							
							 
							
							... 
							
							
							
							fix docker user json output 
							
						 
						
							2018-08-06 09:37:29 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joe Williams 
								
							 
						 
						
							
							
								
							
							
	cfb3357a12  
						 
						
							
							
								
								
								fix docker user json output  
							
							 
							
							... 
							
							
							
							This prints out the docker users in a similar fashion to the other tests, including `INFO` rather than just the system command output.
Signed-off-by: Joe Williams <joe.williams@github.com> 
							
						 
						
							2018-07-26 15:07:59 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nigel Brown 
								
							 
						 
						
							
							
								
							
							
	167c3507a2  
						 
						
							
							
								
								
								Fixes incorrect reporting of TLS configuration in test 2.6  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nigel Brown <nigel@windsock.io> 
							
						 
						
							2018-07-10 14:35:30 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	b73d254e76 
 
						 
						
							
							
								
								
								Merge pull request  #311  from konstruktoid/ISSUE309  
							
							 
							
							... 
							
							
							
							deprecated --disable-legacy-registry 
							
						 
						
							2018-07-01 20:55:32 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	c8894d3b26  
						 
						
							
							
								
								
								deprecated --disable-legacy-registry  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-07-01 20:53:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	b881675d51 
 
						 
						
							
							
								
								
								Merge pull request  #310  from konstruktoid/ISSUE302  
							
							 
							
							... 
							
							
							
							Issue302 
							
						 
						
							2018-07-01 20:07:27 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	78700f2600  
						 
						
							
							
								
								
								consistent currentScore  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-07-01 20:04:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	ebfb20c65f  
						 
						
							
							
								
								
								4.7 is not scored  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-07-01 20:01:10 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	ca41ed7db3 
 
						 
						
							
							
								
								
								Merge pull request  #308  from mike01/path_variable_fix  
							
							 
							
							... 
							
							
							
							fix for path variable 
							
						 
						
							2018-07-01 19:50:10 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Stahn 
								
							 
						 
						
							
							
								
							
							
	d24ee50420  
						 
						
							
							
								
								
								fix for path variable  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Stahn <michael.stahn.42@gmail.com> 
							
						 
						
							2018-06-26 21:57:15 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	b926f0446a 
 
						 
						
							
							
								
								
								Merge pull request  #305  from danielino/master  
							
							 
							
							... 
							
							
							
							fix count total_containers for swarm mode 
							
						 
						
							2018-05-18 12:58:00 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Daniele Marcocci 
								
							 
						 
						
							
							
								
							
							
	77074962b1  
						 
						
							
							
								
								
								fix count total_containers for swarm mode  
							
							 
							
							... 
							
							
							
							Signed-off-by: Daniele Marcocci <daniele.marcocci@par-tec.it> 
							
						 
						
							2018-05-18 10:17:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	f7518b4d7a 
 
						 
						
							
							
								
								
								Merge pull request  #301  from konstruktoid/yell  
							
							 
							
							... 
							
							
							
							prettier yell output 
							
						 
						
							2018-05-10 15:47:56 +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 
								
							 
						 
						
							
							
								
							
							
	
	
	6829756643 
 
						 
						
							
							
								
								
								Merge pull request  #300  from konstruktoid/lint  
							
							 
							
							... 
							
							
							
							Lint and yell function 
							
						 
						
							2018-05-10 15:43:30 +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 
								
							 
						 
						
							
							
								
							
							
	
	
	2a549f5be5 
 
						 
						
							
							
								
								
								Merge pull request  #299  from konstruktoid/issue298  
							
							 
							
							... 
							
							
							
							add -e option to exclude checks 
							
						 
						
							2018-05-10 14:50:08 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	f78145214a  
						 
						
							
							
								
								
								add -e option to exclude checks  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-05-10 14:45:59 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	d03f69931c 
 
						 
						
							
							
								
								
								Merge pull request  #297  from konstruktoid/ISSUE296  
							
							 
							
							... 
							
							
							
							enable docker run script options 
							
						 
						
							2018-05-02 14:53:26 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	173d80f30e  
						 
						
							
							
								
								
								enable docker run script options  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> 
							
						 
						
							2018-05-02 14:52:38 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	0c00cc0336 
 
						 
						
							
							
								
								
								Merge pull request  #293  from mpritter76/master  
							
							 
							
							... 
							
							
							
							Minor fix to ensure exclude only works against container name 
							
						 
						
							2018-02-28 09:22:01 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mike Ritter 
								
							 
						 
						
							
							
								
							
							
	b37dfb95e3  
						 
						
							
							
								
								
								Minor fix to ensure exclude only works against container name  
							
							 
							
							... 
							
							
							
							Signed-off-by: Mike Ritter <mike.ritter@target.com> 
							
						 
						
							2018-02-27 18:24:25 -06:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Sjögren 
								
							 
						 
						
							
							
								
							
							
	
	
	dd61f061fc 
 
						 
						
							
							
								
								
								Merge pull request  #292  from mpritter76/master  
							
							 
							
							... 
							
							
							
							New Features 
							
						 
						
							2018-02-27 15:56:14 +01:00