mirror of
https://github.com/containers/podman.git
synced 2025-11-02 23:39:52 +08:00
vendor: bump buildah, c/image and c/storage
Bumps c/buildah to -> `v1.24.3-0.20220310160415-5ec70bf01ea5` c/storage to -> `v1.38.3-0.20220308085612-93ce26691863` c/image to -> `v5.20.1-0.20220310094651-0d8056ee346f` Signed-off-by: Aditya R <arajan@redhat.com>
This commit is contained in:
6
vendor/github.com/containers/buildah/pkg/parse/parse.go
generated
vendored
6
vendor/github.com/containers/buildah/pkg/parse/parse.go
generated
vendored
@ -86,8 +86,13 @@ func CommonBuildOptionsFromFlagSet(flags *pflag.FlagSet, findFlagFunc func(name
|
||||
}
|
||||
}
|
||||
|
||||
noHosts, _ := flags.GetBool("no-hosts")
|
||||
|
||||
addHost, _ := flags.GetStringSlice("add-host")
|
||||
if len(addHost) > 0 {
|
||||
if noHosts {
|
||||
return nil, errors.Errorf("--no-hosts and --add-host conflict, can not be used together")
|
||||
}
|
||||
for _, host := range addHost {
|
||||
if err := validateExtraHost(host); err != nil {
|
||||
return nil, errors.Wrapf(err, "invalid value for add-host")
|
||||
@ -159,6 +164,7 @@ func CommonBuildOptionsFromFlagSet(flags *pflag.FlagSet, findFlagFunc func(name
|
||||
HTTPProxy: httpProxy,
|
||||
Memory: memoryLimit,
|
||||
MemorySwap: memorySwap,
|
||||
NoHosts: noHosts,
|
||||
ShmSize: findFlagFunc("shm-size").Value.String(),
|
||||
Ulimit: ulimit,
|
||||
Volumes: volumes,
|
||||
|
||||
Reference in New Issue
Block a user