Merge pull request #26378 from chbatey/really-fix-async-dns

Kill/Stop container if still running from previous
This commit is contained in:
Johannes Rudolph 2019-02-14 15:18:41 +01:00 committed by GitHub
commit bb8c47595f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -55,10 +55,12 @@ trait DockerBindDnsService extends Eventually { self: AkkaSpec ⇒
val containerName = "akka-test-dns-" + getClass.getCanonicalName val containerName = "akka-test-dns-" + getClass.getCanonicalName
client.listContainers().asScala.filter(_.names().contains(containerName)) client.listContainers(ListContainersParam.allContainers()).asScala
.foreach(c { .find(_.names().asScala.exists(_.contains(containerName))).foreach(c {
log.debug("Removing container id: {} from previous test run", c.id()) if ("running" == c.state()) {
client.removeContainer(c.id()) client.killContainer(c.id)
}
client.removeContainer(c.id)
}) })
val creation = client.createContainer(containerConfig, containerName) val creation = client.createContainer(containerConfig, containerName)