docker containers should be stopped before being removed - refs https://github.com/docker/docker/issues/18758

8 files changed, 9 insertions, 0 deletions

diff --git a/apps/files_external/tests/env/stop-amazons3-ceph.sh b/apps/files_external/tests/env/stop-amazons3-ceph.sh
index dcf30d8c515..f559f8f9058 100755
--- a/apps/files_external/tests/env/stop-amazons3-ceph.sh
+++ b/apps/files_external/tests/env/stop-amazons3-ceph.sh
@@ -27,6 +27,7 @@ fi;
 for container in `cat $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.amazons3`; do
     echo "Stopping and removing docker container $container"
     # kills running container and removes it
+    docker stop $container
     docker rm -f $container
 done;
 
diff --git a/apps/files_external/tests/env/stop-ftp-morrisjobke.sh b/apps/files_external/tests/env/stop-ftp-morrisjobke.sh
index e30ec2e594a..eedf8f82a50 100755
--- a/apps/files_external/tests/env/stop-ftp-morrisjobke.sh
+++ b/apps/files_external/tests/env/stop-ftp-morrisjobke.sh
@@ -27,6 +27,7 @@ fi;
 for container in `cat $thisFolder/dockerContainerMorrisJobke.$EXECUTOR_NUMBER.ftp`; do
     echo "Stopping and removing docker container $container"
     # kills running container and removes it
+    docker stop $container
     docker rm -f $container
 done;
 
diff --git a/apps/files_external/tests/env/stop-sftp-atmoz.sh b/apps/files_external/tests/env/stop-sftp-atmoz.sh
index 0c2fd0b5bc6..44380152340 100755
--- a/apps/files_external/tests/env/stop-sftp-atmoz.sh
+++ b/apps/files_external/tests/env/stop-sftp-atmoz.sh
@@ -27,6 +27,7 @@ fi;
 for container in `cat $thisFolder/dockerContainerAtmoz.$EXECUTOR_NUMBER.sftp`; do
     echo "Stopping and removing docker container $container"
     # kills running container and removes it
+    docker stop $container
     docker rm -f $container
 done;
 
diff --git a/apps/files_external/tests/env/stop-smb-silvershell.sh b/apps/files_external/tests/env/stop-smb-silvershell.sh
index 40147b89106..56866f13b1f 100755
--- a/apps/files_external/tests/env/stop-smb-silvershell.sh
+++ b/apps/files_external/tests/env/stop-smb-silvershell.sh
@@ -27,6 +27,7 @@ fi;
 for container in `cat $thisFolder/dockerContainerSilvershell.$EXECUTOR_NUMBER.smb`; do
     echo "Stopping and removing docker container $container"
     # kills running container and removes it
+    docker stop $container
     docker rm -f $container
 done;
 
diff --git a/apps/files_external/tests/env/stop-swift-ceph.sh b/apps/files_external/tests/env/stop-swift-ceph.sh
index 9f15fb05a7d..418f96e63f6 100755
--- a/apps/files_external/tests/env/stop-swift-ceph.sh
+++ b/apps/files_external/tests/env/stop-swift-ceph.sh
@@ -29,6 +29,7 @@ for container in `cat $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift`; d
 
     echo "Stopping and removing docker container $container"
     # kills running container and removes it
+    docker stop $container
     docker rm -f $container
 done;
 
diff --git a/apps/files_external/tests/env/stop-webdav-ownCloud.sh b/apps/files_external/tests/env/stop-webdav-ownCloud.sh
index 8eaf1ba754f..613a22efb8c 100755
--- a/apps/files_external/tests/env/stop-webdav-ownCloud.sh
+++ b/apps/files_external/tests/env/stop-webdav-ownCloud.sh
@@ -27,6 +27,7 @@ fi;
 for container in `cat $thisFolder/dockerContainerOwnCloud.$EXECUTOR_NUMBER.webdav`; do
     echo "Stopping and removing docker container $container"
     # kills running container and removes it
+    docker stop $container
     docker rm -f $container
 done;
 
diff --git a/autotest.sh b/autotest.sh
index ba6ec383866..33c4ad50de8 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -122,6 +122,7 @@ function cleanup_config {
 
 	if [ ! -z "$DOCKER_CONTAINER_ID" ]; then
 		echo "Kill the docker $DOCKER_CONTAINER_ID"
+		docker stop "$DOCKER_CONTAINER_ID"
 		docker rm -f "$DOCKER_CONTAINER_ID"
 	fi
 
@@ -288,6 +289,7 @@ function execute_tests {
 
 	if [ ! -z "$DOCKER_CONTAINER_ID" ] ; then
 		echo "Kill the docker $DOCKER_CONTAINER_ID"
+		docker stop $DOCKER_CONTAINER_ID
 		docker rm -f $DOCKER_CONTAINER_ID
 		unset DOCKER_CONTAINER_ID
 	fi
diff --git a/tests/objectstore/stop-swift-ceph.sh b/tests/objectstore/stop-swift-ceph.sh
index 23423e73d6a..afc5f712ab4 100755
--- a/tests/objectstore/stop-swift-ceph.sh
+++ b/tests/objectstore/stop-swift-ceph.sh
@@ -31,6 +31,7 @@ if [ -e $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift ]; then
         fi
         echo "Stopping and removing docker container $container"
         # kills running container and removes it
+        docker stop $container
         docker rm -f $container
     done;
 fi;