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/5] 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/5] 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/5] 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 f3f8f565d7e20dfad5fdeb5a07af985bf3cb8acb 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:54:57 +0200
Subject: [PATCH 4/5] warn if Docker exec fails
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/5_container_runtime.sh | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/tests/5_container_runtime.sh b/tests/5_container_runtime.sh
index 3cd9495..7ec7e4d 100644
--- a/tests/5_container_runtime.sh
+++ b/tests/5_container_runtime.sh
@@ -61,6 +61,13 @@ else
fail=0
for c in $containers; do
+ exec_check=`docker exec $c ps -el 2>/dev/null`
+ if [ $? -eq 255 ]; then
+ warn "$check_5_3"
+ warn " * Docker exec fails: $c"
+ fail=1
+ fi
+
processes=`docker exec $c ps -el 2>/dev/null | wc -l | awk '{print $1}'`
if [ $processes -gt 5 ]; then
# If it's the first container, fail the test
@@ -165,8 +172,14 @@ else
fail=0
for c in $containers; do
- processes=`docker exec $c ps -el 2>/dev/null | grep sshd | wc -l | awk '{print $1}'`
+ exec_check=`docker exec $c ps -el 2>/dev/null`
+ if [ $? -eq 255 ]; then
+ warn "$check_5_7"
+ warn " * Docker exec failed: $c"
+ fail=1
+ fi
+ processes=`docker exec $c ps -el 2>/dev/null | grep sshd | wc -l | awk '{print $1}'`
if [ $processes -gt 1 ]; then
# If it's the first container, fail the test
if [ $fail -eq 0 ]; then
From 1578a53c9c4954c088fc47966bc141a537125aa1 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:57:11 +0200
Subject: [PATCH 5/5] rm .dockerignore, single commit PR
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 deletion(-)
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