diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-15 10:35:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 10:35:31 -0400 |
| commit | 81f41ca0d2a0acd9896bb60b1096baa236725dec (patch) | |
| tree | 241e977b225718d34afd71979142c83e1958a415 /cmd/podman/images | |
| parent | 4b6ffda31c258aadcbc6171a7dd745d0fb17393c (diff) | |
| parent | 962675c1482abc3a8458ef060552687a784282a6 (diff) | |
| download | podman-81f41ca0d2a0acd9896bb60b1096baa236725dec.tar.gz podman-81f41ca0d2a0acd9896bb60b1096baa236725dec.tar.bz2 podman-81f41ca0d2a0acd9896bb60b1096baa236725dec.zip | |
Merge pull request #11585 from flouthoc/bump-buildah-1-23-0
vendor: Bump github.com/containers/buildah from 1.22.3 to 1.23.0
Diffstat (limited to 'cmd/podman/images')
| -rw-r--r-- | cmd/podman/images/build.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 31d014dfe..642da0c83 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -11,6 +11,7 @@ import ( buildahDefine "github.com/containers/buildah/define" buildahCLI "github.com/containers/buildah/pkg/cli" "github.com/containers/buildah/pkg/parse" + buildahUtil "github.com/containers/buildah/pkg/util" "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" @@ -359,6 +360,12 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil } } + cleanTmpFile := false + flags.Authfile, cleanTmpFile = buildahUtil.MirrorToTempFileIfPathIsDescriptor(flags.Authfile) + if cleanTmpFile { + defer os.Remove(flags.Authfile) + } + args := make(map[string]string) if c.Flag("build-arg").Changed { for _, arg := range flags.BuildArg { |