root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Remove Docker container after launch script test execution 

Closes gh-5059
This commit is contained in:
Vedran Pavic 2016-01-31 22:29:39 +01:00 committed by Andy Wilkinson
parent 29c7b93640
commit 6540b1f383
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java
View File

@ -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 {
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()