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

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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

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;