mirror of
https://github.com/containers/podman.git
synced 2025-12-08 14:48:48 +08:00
vendor latest c/{buildah,common,image,storage}
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
23
vendor/github.com/containers/storage/containers.go
generated
vendored
23
vendor/github.com/containers/storage/containers.go
generated
vendored
@@ -3,7 +3,6 @@ package storage
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"maps"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"slices"
|
||||
@@ -164,17 +163,17 @@ type containerStore struct {
|
||||
func copyContainer(c *Container) *Container {
|
||||
return &Container{
|
||||
ID: c.ID,
|
||||
Names: copyStringSlice(c.Names),
|
||||
Names: copySlicePreferringNil(c.Names),
|
||||
ImageID: c.ImageID,
|
||||
LayerID: c.LayerID,
|
||||
Metadata: c.Metadata,
|
||||
BigDataNames: copyStringSlice(c.BigDataNames),
|
||||
BigDataSizes: maps.Clone(c.BigDataSizes),
|
||||
BigDataDigests: maps.Clone(c.BigDataDigests),
|
||||
BigDataNames: copySlicePreferringNil(c.BigDataNames),
|
||||
BigDataSizes: copyMapPreferringNil(c.BigDataSizes),
|
||||
BigDataDigests: copyMapPreferringNil(c.BigDataDigests),
|
||||
Created: c.Created,
|
||||
UIDMap: copyIDMap(c.UIDMap),
|
||||
GIDMap: copyIDMap(c.GIDMap),
|
||||
Flags: maps.Clone(c.Flags),
|
||||
UIDMap: copySlicePreferringNil(c.UIDMap),
|
||||
GIDMap: copySlicePreferringNil(c.GIDMap),
|
||||
Flags: copyMapPreferringNil(c.Flags),
|
||||
volatileStore: c.volatileStore,
|
||||
}
|
||||
}
|
||||
@@ -692,9 +691,9 @@ func (r *containerStore) create(id string, names []string, image, layer string,
|
||||
BigDataSizes: make(map[string]int64),
|
||||
BigDataDigests: make(map[string]digest.Digest),
|
||||
Created: time.Now().UTC(),
|
||||
Flags: copyStringInterfaceMap(options.Flags),
|
||||
UIDMap: copyIDMap(options.UIDMap),
|
||||
GIDMap: copyIDMap(options.GIDMap),
|
||||
Flags: newMapFrom(options.Flags),
|
||||
UIDMap: copySlicePreferringNil(options.UIDMap),
|
||||
GIDMap: copySlicePreferringNil(options.GIDMap),
|
||||
volatileStore: options.Volatile,
|
||||
}
|
||||
if options.MountOpts != nil {
|
||||
@@ -906,7 +905,7 @@ func (r *containerStore) BigDataNames(id string) ([]string, error) {
|
||||
if !ok {
|
||||
return nil, ErrContainerUnknown
|
||||
}
|
||||
return copyStringSlice(c.BigDataNames), nil
|
||||
return copySlicePreferringNil(c.BigDataNames), nil
|
||||
}
|
||||
|
||||
// Requires startWriting.
|
||||
|
||||
Reference in New Issue
Block a user