Skip to content

Commit

Permalink
Merge pull request containers#2646 from giuseppe/fix-build-order
Browse files Browse the repository at this point in the history
build: fix build DIR -t TAG
  • Loading branch information
openshift-merge-robot authored Mar 15, 2019
2 parents e16cdf7 + fc65d71 commit a73814c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cmd/podman/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
7 changes: 7 additions & 0 deletions test/test_podman_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ########################################################
Expand Down

0 comments on commit a73814c

Please sign in to comment.