Commit 6540b1f3 authored by Vedran Pavic's avatar Vedran Pavic Committed by Andy Wilkinson

Remove Docker container after launch script test execution

Closes gh-5059
parent 29c7b936
...@@ -206,24 +206,29 @@ public class SysVinitLaunchScriptIT { ...@@ -206,24 +206,29 @@ public class SysVinitLaunchScriptIT {
DockerClient docker = createClient(); DockerClient docker = createClient();
String imageId = buildImage(docker); String imageId = buildImage(docker);
String container = createContainer(docker, imageId, script); String container = createContainer(docker, imageId, script);
copyFilesToContainer(docker, container, script); try {
docker.startContainerCmd(container).exec(); copyFilesToContainer(docker, container, script);
StringBuilder output = new StringBuilder(); docker.startContainerCmd(container).exec();
AttachContainerResultCallback resultCallback = docker StringBuilder output = new StringBuilder();
.attachContainerCmd(container).withStdOut(true).withStdErr(true) AttachContainerResultCallback resultCallback = docker
.withFollowStream(true).withLogs(true) .attachContainerCmd(container).withStdOut(true).withStdErr(true)
.exec(new AttachContainerResultCallback() { .withFollowStream(true).withLogs(true)
.exec(new AttachContainerResultCallback() {
@Override
public void onNext(Frame item) { @Override
output.append(new String(item.getPayload())); public void onNext(Frame item) {
super.onNext(item); output.append(new String(item.getPayload()));
} super.onNext(item);
}
});
resultCallback.awaitCompletion(60, TimeUnit.SECONDS).close(); });
docker.waitContainerCmd(container).exec(); resultCallback.awaitCompletion(60, TimeUnit.SECONDS).close();
return output.toString(); docker.waitContainerCmd(container).exec();
return output.toString();
}
finally {
docker.removeContainerCmd(container).exec();
}
} }
private DockerClient createClient() { private DockerClient createClient() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment