diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-26 11:23:46 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-03-29 11:06:03 -0400 |
| commit | e7dc66d832d44eac11cb341f09844850e3e0224d (patch) | |
| tree | e836a3d9a5ff60c9019e3daf2601d3c922af2a38 /cmd | |
| parent | 57e0d8f2930690de69c690c41e30abaa2cdb3776 (diff) | |
| download | podman-e7dc66d832d44eac11cb341f09844850e3e0224d.tar.gz podman-e7dc66d832d44eac11cb341f09844850e3e0224d.tar.bz2 podman-e7dc66d832d44eac11cb341f09844850e3e0224d.zip | |
[NO TESTS NEEDED] Vendor in containers/buildah v1.20.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
<MH: Fixed cherry-pick conflicts. Re-ran vendor.>
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/images/build.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 3b34a6bf6..f24e9a8f6 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -9,7 +9,7 @@ import ( "time" "github.com/containers/buildah" - "github.com/containers/buildah/imagebuildah" + "github.com/containers/buildah/define" buildahCLI "github.com/containers/buildah/pkg/cli" "github.com/containers/buildah/pkg/parse" "github.com/containers/common/pkg/completion" @@ -196,7 +196,7 @@ func build(cmd *cobra.Command, args []string) error { var contextDir string if len(args) > 0 { // The context directory could be a URL. Try to handle that. - tempDir, subDir, err := imagebuildah.TempDirForURL("", "buildah", args[0]) + tempDir, subDir, err := define.TempDirForURL("", "buildah", args[0]) if err != nil { return errors.Wrapf(err, "error prepping temporary context directory") } @@ -304,16 +304,16 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil return nil, err } - pullPolicy := imagebuildah.PullIfMissing + pullPolicy := define.PullIfMissing if c.Flags().Changed("pull") && flags.Pull { - pullPolicy = imagebuildah.PullAlways + pullPolicy = define.PullAlways } if flags.PullAlways { - pullPolicy = imagebuildah.PullAlways + pullPolicy = define.PullAlways } if flags.PullNever { - pullPolicy = imagebuildah.PullIfMissing + pullPolicy = define.PullIfMissing } args := make(map[string]string) @@ -388,9 +388,9 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil flags.Layers = false } - compression := imagebuildah.Gzip + compression := define.Gzip if flags.DisableCompression { - compression = imagebuildah.Uncompressed + compression = define.Uncompressed } isolation, err := parse.IsolationOption(flags.Isolation) @@ -443,7 +443,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil return nil, errors.Wrapf(err, "unable to obtain decrypt config") } - opts := imagebuildah.BuildOptions{ + opts := define.BuildOptions{ AddCapabilities: flags.CapAdd, AdditionalTags: tags, Annotations: flags.Annotation, |