summaryrefslogtreecommitdiffstats
path: root/autotest.sh
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-03-09 14:02:08 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-03-09 14:02:08 +0100
commitcf3cb4d75e2e42bf96a2e6289267d887c2378122 (patch)
treea7301a1999f31c3500322ddbe55e1432cce31682 /autotest.sh
parenteff17fd3b7021019e387e4f48a38ec450f622649 (diff)
downloadnextcloud-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 'autotest.sh')
-rwxr-xr-xautotest.sh2
1 files changed, 2 insertions, 0 deletions
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