diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-03-14 15:31:10 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-03-15 10:39:17 +0100 |
| commit | fc65d71df2c95105d02316f369837a84fa4df0cb (patch) | |
| tree | 028106c235dd43fca11fa4bc5496ea2a367ffbc8 | |
| parent | 39859850aec4d0d3fe8bcf7804f6f02a245e2b6e (diff) | |
| download | podman-fc65d71df2c95105d02316f369837a84fa4df0cb.tar.gz podman-fc65d71df2c95105d02316f369837a84fa4df0cb.tar.bz2 podman-fc65d71df2c95105d02316f369837a84fa4df0cb.zip | |
build: fix build DIR -t TAG
accept also the order "build DIR -t TAG"
Closes: https://github.com/containers/libpod/issues/2636
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | cmd/podman/build.go | 2 | ||||
| -rw-r--r-- | test/test_podman_build.sh | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go index 72d78aff9..f0a67791a 100644 --- 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 index 9faefc78a..39f1e784d 100644 --- a/test/test_podman_build.sh +++ b/test/test_podman_build.sh @@ -34,6 +34,13 @@ echo ######################################################## 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 ######################################################## TARGET=volume-image |