summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-03-26 11:23:46 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-03-26 13:57:27 -0400
commitfc197fb4f5c0e0d90da39fe672bce7d145272415 (patch)
tree56913b09296f1116d7d22d1bb938eba55d14c700 /cmd/podman
parentfa6ba9b00fb5f77ead67b624be510ec50b2f4f5e (diff)
downloadpodman-fc197fb4f5c0e0d90da39fe672bce7d145272415.tar.gz
podman-fc197fb4f5c0e0d90da39fe672bce7d145272415.tar.bz2
podman-fc197fb4f5c0e0d90da39fe672bce7d145272415.zip
[NO TESTS NEEDED] Vendor in containers/buildah v1.20.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/images/build.go18
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,