summaryrefslogtreecommitdiff
path: root/pkg/bindings/images
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-03-29 13:41:42 +0000
committerGitHub <noreply@github.com>2021-03-29 13:41:42 +0000
commitac3499cc9605dd2c7bfccedd6f9a95c7bc0dd9ad (patch)
tree401c7ddec178185b6af4dc782bfbba4d20673e06 /pkg/bindings/images
parent259004f0a9cc18018127baec0bfcf8bc091dabb6 (diff)
parent4d5199537737b0cfef47d3d2700013a787126d21 (diff)
downloadpodman-ac3499cc9605dd2c7bfccedd6f9a95c7bc0dd9ad.tar.gz
podman-ac3499cc9605dd2c7bfccedd6f9a95c7bc0dd9ad.tar.bz2
podman-ac3499cc9605dd2c7bfccedd6f9a95c7bc0dd9ad.zip
Merge pull request #9631 from rhatdan/pull
Fix podman build --pull-never
Diffstat (limited to 'pkg/bindings/images')
-rw-r--r--pkg/bindings/images/build.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index 9d77883f9..17095b84b 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -15,7 +15,6 @@ import (
"strconv"
"strings"
- "github.com/containers/buildah"
"github.com/containers/podman/v3/pkg/auth"
"github.com/containers/podman/v3/pkg/bindings"
"github.com/containers/podman/v3/pkg/domain/entities"
@@ -175,9 +174,9 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
if len(platform) > 0 {
params.Set("platform", platform)
}
- if options.PullPolicy == buildah.PullAlways {
- params.Set("pull", "1")
- }
+
+ params.Set("pullpolicy", options.PullPolicy.String())
+
if options.Quiet {
params.Set("q", "1")
}