mirror of
https://github.com/containers/podman.git
synced 2025-12-07 14:20:44 +08:00
Bump Buildah to v1.24.0
Bumps Buildah to v1.24.0 and adopts the new values for pull: true, false, never, and always. The pull-never and pull-always options for the build command are still usable, but they have been removed from the man page documentation with this change. Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
2
vendor/github.com/containers/common/libnetwork/cni/config.go
generated
vendored
2
vendor/github.com/containers/common/libnetwork/cni/config.go
generated
vendored
@@ -60,7 +60,7 @@ func (n *cniNetwork) networkCreate(newNetwork *types.Network, defaultNet bool) (
|
||||
// Therefore the next podman command tries to create the default net again and it would
|
||||
// fail because it thinks the network is used on the host.
|
||||
var usedNetworks []*net.IPNet
|
||||
if !defaultNet {
|
||||
if !defaultNet && newNetwork.Driver == types.BridgeNetworkDriver {
|
||||
usedNetworks, err = internalutil.GetUsedSubnets(n)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
Reference in New Issue
Block a user