diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-15 07:01:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 07:01:37 -0700 |
| commit | a73814cc6778c08b187e248219d5cfc8fb57b182 (patch) | |
| tree | 78df47c6ba407fd06edac7b0f29f6e710026a824 | |
| parent | e16cdf711f82353be521e1a2867da1bf73829269 (diff) | |
| parent | fc65d71df2c95105d02316f369837a84fa4df0cb (diff) | |
| download | podman-a73814cc6778c08b187e248219d5cfc8fb57b182.tar.gz podman-a73814cc6778c08b187e248219d5cfc8fb57b182.tar.bz2 podman-a73814cc6778c08b187e248219d5cfc8fb57b182.zip | |
Merge pull request #2646 from giuseppe/fix-build-order
build: fix build DIR -t TAG
| -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 |