Bugfix docker build

lorislab · Nov 18, 2019 · 7965120 · 7965120
1 parent 8989ec1
commit 7965120
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/main/java/org/lorislab/samo/DockerCommand.java b/src/main/java/org/lorislab/samo/DockerCommand.java
@@ -172,12 +172,21 @@ public static class Build extends CommonCommand {
         @CommandLine.Option(
                 names = {"-d", "--dockerfile"},
                 paramLabel = "DOCKERFILE",
-                defaultValue = ".",
-                required = true,
                 description = "the docker file"
         )
         String dockerfile;
 
+        /**
+         * The docker repository
+         */
+        @CommandLine.Option(
+                names = {"-c", "--context"},
+                paramLabel = "CONTEXT",
+                required = true,
+                defaultValue = ".",
+                description = "the docker build context"
+        )
+        String context;
 
         /**
          * Verbose flag.
@@ -222,7 +231,10 @@ public Integer call() throws Exception {
                 sb.append(" -t ").append(branchTag);
                 log.append(",").append(branchTag);
             }
-            sb.append(" ").append(dockerfile);
+            if (dockerfile != null && !dockerfile.isEmpty()) {
+                sb.append(" -f ").append(dockerfile);
+            }
+            sb.append(" ").append(context);
             log.append("]");
 
             // execute the docker commands