Commit graph

831 commits

Author SHA1 Message Date
Thomas Sjögren
6f5fbd1d65 Merge pull request #179 from konstruktoid/version_1124
docker version 1.12.4
2016-12-13 08:34:51 +01:00
Thomas Sjögren
2f6ddfd500 docker version 1.12.4
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-12-13 08:34:01 +01:00
Thomas Sjögren
63d4c09b1f Merge pull request #178 from konstruktoid/issue_177
use debian:sid for docker.io
2016-12-02 15:59:28 +01:00
Thomas Sjögren
09335befba use debian:sid for docker.io
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-12-02 15:56:28 +01:00
Thomas Sjögren
f986d72a05 Merge pull request #176 from konstruktoid/version_1123
bump version to 1.12.3
2016-10-27 11:41:43 +02:00
Thomas Sjögren
7d4ee87105 bump version to 1.12.3
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-10-27 11:40:55 +02:00
Thomas Sjögren
c28ffea405 Merge pull request #173 from konstruktoid/dockerd
add support for dockerd
2016-10-13 22:51:19 +02: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
Thomas Sjögren
84a764e3d8 Merge pull request #169 from kevinll/master
fix test 2.2 check for log level
Close #166
2016-10-13 22:26:56 +02:00
Thomas Sjögren
0d11e2a9c5 Merge pull request #172 from konstruktoid/version
1.12.2
2016-10-13 22:16:15 +02:00
Thomas Sjögren
e45d4e3bb8 1.12.2
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-10-13 22:15:35 +02:00
Kevin Lim
89e4769877 fix test 2.2 check for log level
Signed-off-by: Kevin Lim <kevin.lim@sap.com>
2016-09-28 14:25:42 -07:00
Mr. Secure
ee3e8dedb3 Fixes #167 - use get_docker_cumulative_command_line_args to check TLS settings
Additionally, split warning into 2 parts:  no TLS, TLS w/o verification

Signed-off-by: Mr. Secure <ben.github@mrsecure.org>
2016-09-24 19:42:39 -05:00
Thomas Sjögren
5bf3e2894c Merge pull request #165 from konstruktoid/version
1.12.1
2016-08-19 23:11:35 +02:00
Thomas Sjögren
adfee878b8 1.12.1
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-08-19 23:11:03 +02:00
Thomas Sjögren
2428b33af8 Merge pull request #163 from kevinll/patch-1
Update helper_lib.sh
2016-08-11 21:57:55 +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
Thomas Sjögren
696d3f2a77 Merge pull request #162 from konstruktoid/issue_161
Issue 161
2016-07-29 20:32:34 +02:00
Thomas Sjögren
15dc14ce3e bump minor version, closes #161
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-07-29 20:30:11 +02:00
Thomas Sjögren
fdac630c36 bump docker version to 1.12
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-07-29 18:40:40 +02:00
Thomas Sjögren
46cc95c697 Merge pull request #160 from konstruktoid/issue_158
mention adjusting volumes
2016-07-21 22:24:31 +02:00
Thomas Sjögren
09ccf6ca1f mention adjusting volumes
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-07-21 22:00:47 +02:00
Thomas Sjögren
46ad0d7f06 Merge pull request #153 from dhawal55/master
fix issue #152: Avoid picking early-docker by selecting newest docker daemon process
2016-06-29 22:54:34 +02: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
4522adb3b2 Merge pull request #151 from konstruktoid/1.11.2
1.11.2
2016-06-02 21:51:45 +02:00
Thomas Sjögren
9ba6afe0f2 1.11.2
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-06-02 21:51:11 +02:00
Thomas Sjögren
7976432be3 Merge pull request #146 from konstruktoid/issue_145
closes #145
2016-05-15 17:32:48 +02:00
Thomas Sjögren
f75cb30aaa issue 145
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-05-15 17:30:51 +02:00
Thomas Sjögren
72ba62f09c Merge pull request #144 from konstruktoid/update_image
update image
2016-04-30 23:10:24 +02:00
Thomas Sjögren
b3c1b7bd7a update image
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-04-30 23:09:27 +02:00
Thomas Sjögren
fdbd1fc7bd Merge pull request #143 from konstruktoid/cis_benchmark_output
update yell to 1.11 as well
2016-04-30 23:03:55 +02:00
Thomas Sjögren
426765b698 update yell to 1.11 as well
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-04-30 23:03:18 +02:00
Thomas Sjögren
8a2a0ce11f Merge pull request #142 from konstruktoid/cis_benchmark
mention 1.11 benchmark instead of 1.6
2016-04-30 22:32:15 +02:00
Thomas Sjögren
4a628c6520 mention 1.11 benchmark instead of 1.6
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-04-30 22:31:08 +02:00
Thomas Sjögren
f8ca4f5feb Merge pull request #141 from konstruktoid/version
new version
2016-04-28 21:52:07 +02:00
Thomas Sjögren
80e571f759 new version
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-04-28 21:51:24 +02:00
Thomas Sjögren
f22c5f083f Merge pull request #140 from konstruktoid/img_link
correct image link
2016-04-21 20:34:03 +02:00
Thomas Sjögren
34e765cff5 correct image link
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-04-21 20:33:32 +02:00
Thomas Sjögren
9057a4622a Merge pull request #139 from konstruktoid/logo
update screenshot
2016-04-20 21:14:22 +02:00
Thomas Sjögren
efc0e15e45 update screenshot
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-04-20 21:09:57 +02:00
Diogo Mónica
3f950f1ad8 Update CIS benchmark PDF to 1.11 2016-04-20 09:59:25 -07:00
Thomas Sjögren
797b002942 Merge pull request #137 from konstruktoid/cis_1.11_6
update chap 6 to cis 1.11
2016-04-15 00:23:58 +02:00
Thomas Sjögren
81b093632a update chap 6 to cis 1.11
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-04-15 00:23:03 +02:00
Thomas Sjögren
80566399ca Merge pull request #136 from konstruktoid/cis_1.11_5
update chap 5 to cis 1.11
2016-04-15 00:13:10 +02:00
Thomas Sjögren
9e94259903 update chap 5 to cis 1.11
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-04-15 00:12:00 +02:00
Thomas Sjögren
e849844bc6 Merge pull request #135 from konstruktoid/cis_1.11_4
update chap 4 to cis 1.11
2016-04-14 23:16:32 +02:00
Thomas Sjögren
c544e417b0 update chap 4 to cis 1.11
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-04-14 23:15:16 +02:00
Thomas Sjögren
f412732143 Merge pull request #134 from konstruktoid/cis_1.11_3
update chap 3 to cis 1.11
2016-04-14 22:59:21 +02:00
Thomas Sjögren
e3da5eacf0 update chap 3 to cis 1.11
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-04-14 22:57:25 +02:00
Thomas Sjögren
9911abbc2d Merge pull request #133 from konstruktoid/cis_1.11_2
update chap 2 to cis 1.11
2016-04-14 22:26:33 +02:00