Skip to content

S
spring-boot
Commit 6540b1f3 authored by Vedran Pavic's avatar Vedran Pavic Committed by Andy Wilkinson
Browse files
Options

Remove Docker container after launch script test execution 

Closes gh-5059
parent 29c7b936
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 18 deletions
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java
View file @ 6540b1f3
...@@ -206,6 +206,7 @@ public class SysVinitLaunchScriptIT { ...@@ -206,6 +206,7 @@ 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);
try {
copyFilesToContainer(docker, container, script); copyFilesToContainer(docker, container, script);
docker.startContainerCmd(container).exec(); docker.startContainerCmd(container).exec();
StringBuilder output = new StringBuilder(); StringBuilder output = new StringBuilder();
...@@ -225,6 +226,10 @@ public class SysVinitLaunchScriptIT { ...@@ -225,6 +226,10 @@ public class SysVinitLaunchScriptIT {
docker.waitContainerCmd(container).exec(); docker.waitContainerCmd(container).exec();
return output.toString(); return output.toString();
} }
finally {
docker.removeContainerCmd(container).exec();
}
}
private DockerClient createClient() { private DockerClient createClient() {
DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder() DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder()
......
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