summaryrefslogtreecommitdiff
path: root/cmd/podman/images
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-03-26 15:44:02 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-03-27 05:33:30 -0400
commit4d5199537737b0cfef47d3d2700013a787126d21 (patch)
tree46da1fe2b2a51f437f592465e434c6487d17a1f8 /cmd/podman/images
parent4d0b583340c37efbf175c00d75d75107a0b23f00 (diff)
downloadpodman-4d5199537737b0cfef47d3d2700013a787126d21.tar.gz
podman-4d5199537737b0cfef47d3d2700013a787126d21.tar.bz2
podman-4d5199537737b0cfef47d3d2700013a787126d21.zip
Fix podman build --pull-never
Currently pull policy is set incorrectly when users set --pull-never. Also pull-policy is not being translated correctly when using podman-remote. Fixes: #9573 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman/images')
-rw-r--r--cmd/podman/images/build.go17
1 files changed, 16 insertions, 1 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index f24e9a8f6..7db927e55 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -304,6 +304,21 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
return nil, err
}
+ pullFlagsCount := 0
+ if c.Flag("pull").Changed {
+ pullFlagsCount++
+ }
+ if c.Flag("pull-always").Changed {
+ pullFlagsCount++
+ }
+ if c.Flag("pull-never").Changed {
+ pullFlagsCount++
+ }
+
+ if pullFlagsCount > 1 {
+ return nil, errors.Errorf("can only set one of 'pull' or 'pull-always' or 'pull-never'")
+ }
+
pullPolicy := define.PullIfMissing
if c.Flags().Changed("pull") && flags.Pull {
pullPolicy = define.PullAlways
@@ -313,7 +328,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
}
if flags.PullNever {
- pullPolicy = define.PullIfMissing
+ pullPolicy = define.PullNever
}
args := make(map[string]string)