opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 03:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20726 from mtrmac/CreateContainerStorage

Browse Source 
Clean up storageService.CreateContainerStorage
This commit is contained in:
openshift-merge-bot[bot]
2023-11-21 07:54:31 +00:00
committed by GitHub
parent 9a63b8038d ae9b63fbf0
commit d20d0fddc6
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libpod/storage.go
View File

@ -66,21 +66,17 @@ func (metadata *RuntimeContainerMetadata) SetMountLabel(mountLabel string) {
metadata.MountLabel = mountLabel
}
// CreateContainerStorage creates the storage end of things. We already have the container spec created
// CreateContainerStorage creates the storage end of things. We already have the container spec created.
// imageID and imageName must both be either empty or non-empty.
// TO-DO We should be passing in an Image object in the future.
func (r *storageService) CreateContainerStorage(ctx context.Context, systemContext *types.SystemContext, imageName, imageID, containerName, containerID string, options storage.ContainerOptions) (_ ContainerInfo, retErr error) {
var imageConfig *v1.Image
if imageName != "" {
var ref types.ImageReference
if imageID != "" {
if containerName == "" {
return ContainerInfo{}, define.ErrEmptyID
}
// Check if we have the specified image.
ref, err := istorage.Transport.ParseStoreReference(r.store, imageID)
if err != nil {
return ContainerInfo{}, err
}
_, img, err := istorage.ResolveReference(ref)
ref, err := istorage.Transport.NewStoreReference(r.store, nil, imageID)
if err != nil {
return ContainerInfo{}, err
}
@ -96,12 +92,6 @@ func (r *storageService) CreateContainerStorage(ctx context.Context, systemConte
if err != nil {
return ContainerInfo{}, err
}
// Update the image name and ID.
if imageName == "" && len(img.Names) > 0 {
imageName = img.Names[0]
}
imageID = img.ID
}
// Build metadata to store with the container.