GuillaumeHemmen/docker-bench-security
1
0
Fork 0
mirror of https://github.com/docker/docker-bench-security.git synced 2025-11-04 02:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity
144 commits 3 branches 11 tags 18 MiB
Commit graph

144 commits

Author SHA1 Message Date
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 from iangelov/master 
Count unique image ids only.
Closes
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 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 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 from konstruktoid/issue_65 
Mention the distros directory. Issue
2015-07-31 00:13:30 +02:00
Thomas Sjögren
ba438ec555 Mention the distros directory. Issue 
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 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 from konstruktoid/label 
label rule for 1.8
 2015-07-25 10:07:52 -07:00
Thomas Sjögren
f205d27f93 Merge pull request 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 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 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 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 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 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 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 from konstruktoid/dockerfile_order 
Dockerfile order
 2015-07-01 21:05:04 +02:00
Thomas Sjögren
dbb8b8067e Merge pull request 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
Thomas Sjögren
cbb351bbf3 FROM must be the first instruction 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2015-07-01 20:59:09 +02:00
Thomas Sjögren
828bfb4a16 Add Debian Dockerfile 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2015-07-01 20:57:26 +02:00
Thomas Sjögren
19d3d39e50 Merge pull request from jlusiardi/fix_issue_47 
Fix for issue .
 2015-07-01 20:16:27 +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
fae2639313 Addition to fix for issue . 
Missed the potentially wrong invocations of pgrep also in section 3
of the tests. Replace "pgrep -lf" there as well.

Signed-off-by: Joachim Lusiardi <joachim@lusiardi.de>
 2015-06-29 22:27:59 +02:00
Joachim Lusiardi
fc8eefb8a6 Fix for issue . 
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
Diogo Monica
f18f5edff0 Change the scripts header to mention Docker Benchmark for Security 2015-06-28 11:04:53 -07:00
Diogo Mónica
7efb4b1d95 Update README 2015-06-28 11:00:37 -07:00
Diogo Mónica
f9fc158951 Merge pull request from konstruktoid/distro_dir 
Distro dir
 2015-06-28 10:34:49 -07:00
Thomas Sjögren
7afc408e49 remove Dockerfile from readme 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2015-06-26 02:18:56 +02:00
Thomas Sjögren
e2cd15bf52 Dockerfile name 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2015-06-23 22:48:37 +02:00
Thomas Sjögren
2a9d8a0da7 distro specific example 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2015-06-23 22:46:03 +02:00
Thomas Sjögren
a324c22e3c distro specific readme 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2015-06-23 22:45:43 +02:00
Thomas Sjögren
0df4448fb8 Merge pull request from konstruktoid/apk_update 
keep the image up-to-date
 2015-06-23 21:36:28 +02:00
Thomas Sjögren
641bf4e864 keep the image up-to-date 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2015-06-23 21:32:35 +02:00
Thomas Sjögren
88566a8f9f Merge pull request from konstruktoid/shellcheck 
shellcheck fixes
 2015-06-23 21:20:50 +02:00
Thomas Sjögren
553e2d7c30 Merge remote-tracking branch 'origin/master' into shellcheck 
* origin/master:
  actually catch ssh
  update do_version_check

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>

Conflicts:
	tests/1_host_configuration.sh
	tests/5_container_runtime.sh
 2015-06-23 21:17:41 +02:00