libimage: pull: enforce pull policy for custom platforms

Enforce the pull policy to newer if a custom platform is requested by the user. Some images ship with invalid platforms which we must pessimistically assume, see containers/podman/issues/10682. Signed-off-by: Valentin Rothberg <[email protected]>
containers · Jun 21, 2021 · 39fa31e · 39fa31e
1 parent 82c6ef5
commit 39fa31e
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/libimage/pull.go b/libimage/pull.go
@@ -379,6 +379,16 @@ func (r *Runtime) copySingleImageFromRegistry(ctx context.Context, imageName str
 		return nil, errors.Wrap(storage.ErrImageUnknown, imageName)
 	}
 
+	// Unless the pull policy is "neVer", we must pessimistically assume
+	// that the local image has an invalid architecture (see
+	// containers/podman/issues/10682).  Hence, whenever the user requests
+	// a custom platform, set the pull policy to "neWer" to make sure we're
+	// pulling down the image.
+	if pullPolicy != config.PullPolicyAlways && len(options.Architecture)+len(options.OS)+len(options.Variant) > 0 {
+		logrus.Debugf("Enforcing pull policy to %q to support custom platform (arch: %q, os: %q, variant: %q)", "newer", options.Architecture, options.OS, options.Variant)
+		pullPolicy = config.PullPolicyNewer
+	}
+
 	if pullPolicy == config.PullPolicyMissing && localImage != nil {
 		return []string{resolvedImageName}, nil
 	}