From 8397a32bcd2893cef2c5681c67635eb0a61fcaa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= <konstruktoid@users.noreply.github.com> Date: Sat, 30 May 2015 00:18:52 +0200 Subject: [PATCH 1/4] Add a .git dockerignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> --- .dockerignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..6b8710a --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +.git From b9112ec87c0f185651825549bb084de9b7f20ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= <konstruktoid@users.noreply.github.com> Date: Sat, 30 May 2015 00:21:47 +0200 Subject: [PATCH 2/4] add a Docker version do_version_check to 1.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> --- tests/1_host_configuration.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/1_host_configuration.sh b/tests/1_host_configuration.sh index 49af272..62b917b 100644 --- a/tests/1_host_configuration.sh +++ b/tests/1_host_configuration.sh @@ -40,6 +40,7 @@ fi # 1.6 check_1_6="1.6 - Keep Docker up to date" docker_version=`docker version | grep 'Server version' | awk '{print $3}'` +do_version_check 1.6.2 $docker_version if [ $? -eq 11 ]; then warn "$check_1_6" else From f905234e7e2994823189c81fed5e908c96c30d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= <konstruktoid@users.noreply.github.com> Date: Sat, 30 May 2015 00:25:05 +0200 Subject: [PATCH 3/4] Revert "add a Docker version do_version_check to 1.6" This reverts commit b9112ec87c0f185651825549bb084de9b7f20ff8. --- tests/1_host_configuration.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/1_host_configuration.sh b/tests/1_host_configuration.sh index 62b917b..49af272 100644 --- a/tests/1_host_configuration.sh +++ b/tests/1_host_configuration.sh @@ -40,7 +40,6 @@ fi # 1.6 check_1_6="1.6 - Keep Docker up to date" docker_version=`docker version | grep 'Server version' | awk '{print $3}'` -do_version_check 1.6.2 $docker_version if [ $? -eq 11 ]; then warn "$check_1_6" else From e309c7db9dcadc8643e4de5fd24aa8bf51469455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= <konstruktoid@users.noreply.github.com> Date: Sat, 30 May 2015 00:37:20 +0200 Subject: [PATCH 4/4] no need to cat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> --- .dockerignore | 1 - tests/1_host_configuration.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 6b8710a..0000000 --- a/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/tests/1_host_configuration.sh b/tests/1_host_configuration.sh index 49af272..cf1d833 100644 --- a/tests/1_host_configuration.sh +++ b/tests/1_host_configuration.sh @@ -48,7 +48,7 @@ fi # 1.7 check_1_7="1.7 - Only allow trusted users to control Docker daemon" -docker_users=`cat /etc/group | grep docker` +docker_users=`grep docker /etc/group` info "$check_1_7" for u in $docker_users; do info " * $u"