summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-01-29 13:27:19 -0500
committerGitHub <noreply@github.com>2021-01-29 13:27:19 -0500
commit8f3bcf62474bbfba26982bae88febecd4fa630c2 (patch)
tree90c18a452d3f92f49e6d4e3df09f4861cd808105 /cmd/podman
parent4ee66c2c2ecc747ec3d567c0cff6fb89b2f8f112 (diff)
parentc0bf0ba9e5bfa3df343dd3364c0ee2d8c737ae59 (diff)
downloadpodman-8f3bcf62474bbfba26982bae88febecd4fa630c2.tar.gz
podman-8f3bcf62474bbfba26982bae88febecd4fa630c2.tar.bz2
podman-8f3bcf62474bbfba26982bae88febecd4fa630c2.zip
Merge pull request #9144 from vrothberg/fix-9134
Revert "podman build --pull: use correct policy"
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/images/build.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 957c0ac2d..1f06dace9 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -106,7 +106,9 @@ func buildFlags(cmd *cobra.Command) {
logrus.Errorf("unable to set --pull to true: %v", err)
}
flag.DefValue = "true"
+ flag.Usage = "Always attempt to pull the image (errors are fatal)"
flags.AddFlagSet(&budFlags)
+
// Add the completion functions
budCompletions := buildahCLI.GetBudFlagsCompletions()
completion.CompleteCommandFlags(cmd, budCompletions)
@@ -266,7 +268,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
pullPolicy := imagebuildah.PullIfMissing
if c.Flags().Changed("pull") && flags.Pull {
- pullPolicy = imagebuildah.PullIfNewer
+ pullPolicy = imagebuildah.PullAlways
}
if flags.PullAlways {
pullPolicy = imagebuildah.PullAlways