mirror of
https://github.com/containers/podman.git
synced 2025-05-24 02:27:00 +08:00
pull types allow initial caps
validate pulltype will allow initial caps form cli or yaml file passed to i play kube. Use code related with pullpolicy from containers/common. Signed-off-by: Qi Wang <qiwan@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
@ -537,33 +537,21 @@ func OpenExclusiveFile(path string) (*os.File, error) {
|
|||||||
return os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
|
return os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
|
||||||
}
|
}
|
||||||
|
|
||||||
// PullType whether to pull new image
|
type PullType = config.PullPolicy
|
||||||
type PullType int
|
|
||||||
|
|
||||||
const (
|
var (
|
||||||
// PullImageAlways always try to pull new image when create or run
|
// PullImageAlways always try to pull new image when create or run
|
||||||
PullImageAlways PullType = iota
|
PullImageAlways = config.PullImageAlways
|
||||||
// PullImageMissing pulls image if it is not locally
|
// PullImageMissing pulls image if it is not locally
|
||||||
PullImageMissing
|
PullImageMissing = config.PullImageMissing
|
||||||
// PullImageNever will never pull new image
|
// PullImageNever will never pull new image
|
||||||
PullImageNever
|
PullImageNever = config.PullImageNever
|
||||||
)
|
)
|
||||||
|
|
||||||
// ValidatePullType check if the pullType from CLI is valid and returns the valid enum type
|
// ValidatePullType check if the pullType from CLI is valid and returns the valid enum type
|
||||||
// if the value from CLI is invalid returns the error
|
// if the value from CLI is invalid returns the error
|
||||||
func ValidatePullType(pullType string) (PullType, error) {
|
func ValidatePullType(pullType string) (PullType, error) {
|
||||||
switch pullType {
|
return config.ValidatePullPolicy(pullType)
|
||||||
case "always":
|
|
||||||
return PullImageAlways, nil
|
|
||||||
case "missing", "IfNotPresent":
|
|
||||||
return PullImageMissing, nil
|
|
||||||
case "never":
|
|
||||||
return PullImageNever, nil
|
|
||||||
case "":
|
|
||||||
return PullImageMissing, nil
|
|
||||||
default:
|
|
||||||
return PullImageMissing, errors.Errorf("invalid pull type %q", pullType)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ExitCode reads the error message when failing to executing container process
|
// ExitCode reads the error message when failing to executing container process
|
||||||
|
Reference in New Issue
Block a user