build: fix build DIR -t TAG

accept also the order "build DIR -t TAG" Closes: containers#2636 Signed-off-by: Giuseppe Scrivano <[email protected]>
giuseppe · Mar 15, 2019 · fc65d71 · fc65d71
1 parent 3985985
commit fc65d71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/cmd/podman/build.go b/cmd/podman/build.go
@@ -52,7 +52,7 @@ func init() {
 	buildCommand.SetHelpTemplate(HelpTemplate())
 	buildCommand.SetUsageTemplate(UsageTemplate())
 	flags := buildCommand.Flags()
-	flags.SetInterspersed(false)
+	flags.SetInterspersed(true)
 
 	budFlags := buildahcli.GetBudFlags(&budFlagsValues)
 	flag := budFlags.Lookup("pull")

diff --git a/test/test_podman_build.sh b/test/test_podman_build.sh
@@ -33,6 +33,13 @@ echo ########################################################
   podman images -q
 
 
+echo ########################################################
+echo test "build directory before other options create a tag"
+echo ########################################################
+TARGET=tagged-image
+podman build $HOME/test/build/from-scratch --quiet=True -t $TARGET
+podman images | grep tagged-image
+
 echo ########################################################
 echo test "build-preserve-subvolumes"
 echo ########################################################