Strip trailing slashes in exportDir #62

fabric8io · Dec 5, 2014 · 0db828d · 0db828d
1 parent 9898440
commit 0db828d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/org/jolokia/docker/maven/assembly/DockerFileBuilder.java b/src/main/java/org/jolokia/docker/maven/assembly/DockerFileBuilder.java
@@ -78,7 +78,7 @@ public String content() {
         }
 
         // Volume export
-        if (!"/".equalsIgnoreCase(exportDir)) {
+        if (exportDir.length() > 0) {
             // Dont export a top level export dir
             b.append("VOLUME [\"").append(exportDir).append("\"]\n");
         }
@@ -123,9 +123,13 @@ public DockerFileBuilder maintainer(String maintainer) {
         return this;
     }
 
-    public DockerFileBuilder exportDir(String exportDir) {
-        if (exportDir != null) {
-            this.exportDir = exportDir;
+    public DockerFileBuilder exportDir(String dir) {
+        if (dir != null) {
+            exportDir = dir;
+            // Strip trailing slashes
+            while (exportDir.endsWith("/")) {
+                exportDir = exportDir.substring(0,exportDir.length() - 1);
+            }
         }
         return this;
     }