diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-09 14:02:08 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-09 14:02:08 +0100 |
| commit | cf3cb4d75e2e42bf96a2e6289267d887c2378122 (patch) | |
| tree | a7301a1999f31c3500322ddbe55e1432cce31682 /apps/files_external | |
| parent | eff17fd3b7021019e387e4f48a38ec450f622649 (diff) | |
| download | nextcloud-server-cf3cb4d75e2e42bf96a2e6289267d887c2378122.tar.gz nextcloud-server-cf3cb4d75e2e42bf96a2e6289267d887c2378122.zip | |
docker containers should be stopped before being removed - refs https://github.com/docker/docker/issues/18758
Diffstat (limited to 'apps/files_external')
6 files changed, 6 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; |