mirror of
https://github.com/containers/podman.git
synced 2025-12-03 11:49:18 +08:00
vendor: update containers/{buildah,common,image,storage}
The change in healthcheck_run_test.go, depends on the containers/image change: commit b6afa8ca7b324aca8fd5a7b5b206fc05c0c04874 Author: Mikhail Sokolov <msokolov@evolution.com> Date: Fri Mar 15 13:37:44 2024 +0200 Add support for Docker HealthConfig.StartInterval (v25.0.0+) Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
21
vendor/github.com/containers/common/libnetwork/netavark/ipam.go
generated
vendored
21
vendor/github.com/containers/common/libnetwork/netavark/ipam.go
generated
vendored
@@ -4,6 +4,7 @@ package netavark
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net"
|
||||
|
||||
@@ -357,6 +358,26 @@ func (n *netavarkNetwork) deallocIPs(opts *types.NetworkOptions) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (n *netavarkNetwork) removeNetworkIPAMBucket(network *types.Network) error {
|
||||
if !requiresIPAMAlloc(network) {
|
||||
return nil
|
||||
}
|
||||
db, err := n.openDB()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
return db.Update(func(tx *bbolt.Tx) error {
|
||||
// Ignore ErrBucketNotFound, can happen if the network never allocated any ips,
|
||||
// i.e. because no container was started.
|
||||
if err := tx.DeleteBucket([]byte(network.Name)); err != nil && !errors.Is(err, bbolt.ErrBucketNotFound) {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
// requiresIPAMAlloc return true when we have to allocate ips for this network
|
||||
// it checks the ipam driver and if subnets are set
|
||||
func requiresIPAMAlloc(network *types.Network) bool {
|
||||
|
||||
Reference in New Issue
Block a user