Mad Dockerfile more robust.

alexec · alexec · commit 5e8cfc606c25 · 2015-05-03T10:28:26.000+01:00
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.core.command;
 
 import com.github.dockerjava.api.DockerClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 
@@ -9,6 +11,7 @@
  */
 public class DockerfileFixture implements AutoCloseable {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(DockerfileFixture.class);
     private final DockerClient dockerClient;
     private String directory;
     private String repository;
@@ -21,6 +24,7 @@ public DockerfileFixture(DockerClient dockerClient, String directory) {
 
     public void open() throws Exception {
 
+        LOGGER.info("building {}", directory);
         dockerClient
                 .buildImageCmd(new File("src/test/resources", directory))
                 .withNoCache() // remove alternatives, cause problems
@@ -33,11 +37,15 @@ public void open() throws Exception {
                 .get(0)
                 .getRepoTags()[0];
 
+        LOGGER.info("created {}", repository);
+
         containerId = dockerClient
                 .createContainerCmd(repository)
                 .exec()
                 .getId();
 
+        LOGGER.info("starting {}", containerId);
+
         dockerClient
                 .startContainerCmd(containerId)
                 .exec();
@@ -46,15 +54,23 @@ public void open() throws Exception {
     @Override
     public void close() throws Exception {
 
-        dockerClient
-                .removeContainerCmd(containerId)
-                .withForce() // stop too
-                .exec();
+        if (containerId != null) {
+            LOGGER.info("removing container {}", containerId);
+            dockerClient
+                    .removeContainerCmd(containerId)
+                    .withForce() // stop too
+                    .exec();
+            containerId = null;
+        }
 
-        dockerClient
-                .removeImageCmd(repository)
-                .withForce()
-                .exec();
+        if (repository != null) {
+            LOGGER.info("removing repostiory {}", repository);
+            dockerClient
+                    .removeImageCmd(repository)
+                    .withForce()
+                    .exec();
+            repository = null;
+        }
     }
 
     public String getContainerId() {
