opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-16 12:29:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump c/storage to v1.57.1, c/image v5.34.0, c/common v0.62.0

Browse Source 
If not already bumped, this will bump:

c/storage v1.57.1
c/image v5.34.0
c/common v0.62.0

in preparation for Podman v5.4 and beyond.

Buildah will be vendored in a separate PR.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
tomsweeneyredhat
2025-01-31 18:28:48 -05:00
parent b06d78651a
commit 211d3ea3cf
16 changed files with 226 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vendor/github.com/containers/common/libnetwork/internal/util/bridge.go generated vendored
View File

@@ -10,11 +10,13 @@ import (
"github.com/containers/common/pkg/config"
)
func CreateBridge(n NetUtil, network *types.Network, usedNetworks []*net.IPNet, subnetPools []config.SubnetPool) error {
func CreateBridge(n NetUtil, network *types.Network, usedNetworks []*net.IPNet, subnetPools []config.SubnetPool, checkBridgeConflict bool) error {
if network.NetworkInterface != "" {
bridges := GetBridgeInterfaceNames(n)
if slices.Contains(bridges, network.NetworkInterface) {
return fmt.Errorf("bridge name %s already in use", network.NetworkInterface)
if checkBridgeConflict {
bridges := GetBridgeInterfaceNames(n)
if slices.Contains(bridges, network.NetworkInterface) {
return fmt.Errorf("bridge name %s already in use", network.NetworkInterface)
}
}
if !types.NameRegex.MatchString(network.NetworkInterface) {
return fmt.Errorf("bridge name %s invalid: %w", network.NetworkInterface, types.RegexError)