[WIP] Add utility functions for managing containers and images using containers/storage #210
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| #!/bin/bash | ||
| cc -E - > /dev/null 2> /dev/null << EOF | ||
| #include <btrfs/version.h> | ||
| EOF | ||
| if test $? -ne 0 ; then | ||
| echo btrfs_noversion | ||
| fi |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/bin/bash | ||
| tmpdir="$PWD/tmp.$RANDOM" | ||
| mkdir -p "$tmpdir" | ||
| trap 'rm -fr "$tmpdir"' EXIT | ||
| cc -c -o "$tmpdir"/libdm_tag.o -x c - > /dev/null 2> /dev/null << EOF | ||
| #include <libdevmapper.h> | ||
| int main() { | ||
| struct dm_task *task; | ||
| return 0; | ||
| } | ||
| EOF | ||
| if test $? -ne 0 ; then | ||
| echo libdm_no_deferred_remove | ||
| fi |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| // Package storage provides helper functions for creating and managing CRI pod | ||
| // sandboxes and containers and metadata associated with them in the format | ||
| // that ocid understands. The API it provides should be considered to be | ||
| // unstable. | ||
| package storage |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
| package storage | ||
|
|
||
| import ( | ||
| "github.com/containers/image/copy" | ||
| "github.com/containers/image/signature" | ||
| istorage "github.com/containers/image/storage" | ||
| "github.com/containers/image/transports" | ||
| "github.com/containers/image/types" | ||
| "github.com/containers/storage/storage" | ||
| ) | ||
|
|
||
| // ImageResult wraps a subset of information about an image: its ID, its names, | ||
| // and the size, if known, or nil if it isn't. | ||
| type ImageResult struct { | ||
| ID string | ||
| Names []string | ||
| Size *uint64 | ||
| } | ||
|
|
||
| type imageService struct { | ||
| store storage.Store | ||
| defaultTransport string | ||
| } | ||
|
|
||
| // ImageServer wraps up various CRI-related activities into a reusable | ||
| // implementation. | ||
| type ImageServer interface { | ||
| // ListImages returns list of all images which match the filter. | ||
| ListImages(filter string) ([]ImageResult, error) | ||
| // ImageStatus returns status of an image which matches the filter. | ||
| ImageStatus(systemContext *types.SystemContext, filter string) (*ImageResult, error) | ||
| // PullImage imports an image from the specified location. | ||
| PullImage(systemContext *types.SystemContext, imageName string, options *copy.Options) (types.ImageReference, error) | ||
| // RemoveImage deletes the specified image. | ||
| RemoveImage(systemContext *types.SystemContext, imageName string) error | ||
| // GetStore returns the reference to the storage library Store which | ||
| // the image server uses to hold images, and is the destination used | ||
| // when it's asked to pull an image. | ||
| GetStore() storage.Store | ||
| } | ||
|
|
||
| func (svc *imageService) ListImages(filter string) ([]ImageResult, error) { | ||
| results := []ImageResult{} | ||
| if filter != "" { | ||
| if image, err := svc.store.GetImage(filter); err == nil { | ||
| results = append(results, ImageResult{ | ||
| ID: image.ID, | ||
| Names: image.Names, | ||
| }) | ||
| } | ||
| } else { | ||
| images, err := svc.store.Images() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| for _, image := range images { | ||
| results = append(results, ImageResult{ | ||
| ID: image.ID, | ||
| Names: image.Names, | ||
| }) | ||
| } | ||
| } | ||
| return results, nil | ||
| } | ||
|
|
||
| func (svc *imageService) ImageStatus(systemContext *types.SystemContext, nameOrID string) (*ImageResult, error) { | ||
| ref, err := transports.ParseImageName(nameOrID) | ||
| if err != nil { | ||
| ref2, err2 := istorage.Transport.ParseStoreReference(svc.store, "@"+nameOrID) | ||
| if err2 != nil { | ||
| ref3, err3 := istorage.Transport.ParseStoreReference(svc.store, nameOrID) | ||
| if err3 != nil { | ||
| return nil, err | ||
| } | ||
| ref2 = ref3 | ||
| } | ||
| ref = ref2 | ||
| } | ||
| image, err := istorage.Transport.GetStoreImage(svc.store, ref) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| img, err := ref.NewImage(systemContext) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| size := imageSize(img) | ||
| img.Close() | ||
|
|
||
| return &ImageResult{ | ||
| ID: image.ID, | ||
| Names: image.Names, | ||
| Size: size, | ||
| }, nil | ||
| } | ||
|
|
||
| func imageSize(img types.Image) *uint64 { | ||
| if sum, err := img.Size(); err == nil { | ||
| usum := uint64(sum) | ||
| return &usum | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (svc *imageService) PullImage(systemContext *types.SystemContext, imageName string, options *copy.Options) (types.ImageReference, error) { | ||
| policy, err := signature.DefaultPolicy(systemContext) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| policyContext, err := signature.NewPolicyContext(policy) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if imageName == "" { | ||
| return nil, storage.ErrNotAnImage | ||
| } | ||
| if options == nil { | ||
| options = ©.Options{} | ||
| } | ||
| srcRef, err := transports.ParseImageName(imageName) | ||
| if err != nil { | ||
| if svc.defaultTransport == "" { | ||
| return nil, err | ||
| } | ||
| srcRef2, err2 := transports.ParseImageName(svc.defaultTransport + imageName) | ||
| if err2 != nil { | ||
| return nil, err | ||
| } | ||
| srcRef = srcRef2 | ||
| } | ||
| dest := imageName | ||
| if srcRef.DockerReference() != nil { | ||
| dest = srcRef.DockerReference().FullName() | ||
| } | ||
| destRef, err := istorage.Transport.ParseStoreReference(svc.store, dest) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| err = copy.Image(policyContext, destRef, srcRef, options) | ||
|
Member
There was a problem hiding this comment. if |
||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| // Go find the image, and attach the requested name to it, so that we | ||
| // can more easily find it later, even if the destination reference | ||
| // looks different. | ||
| destImage, err := istorage.Transport.GetStoreImage(svc.store, destRef) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| names := append(destImage.Names, imageName, dest) | ||
| err = svc.store.SetNames(destImage.ID, names) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return destRef, nil | ||
| } | ||
|
|
||
| func (svc *imageService) RemoveImage(systemContext *types.SystemContext, nameOrID string) error { | ||
| ref, err := transports.ParseImageName(nameOrID) | ||
| if err != nil { | ||
| ref2, err2 := istorage.Transport.ParseStoreReference(svc.store, "@"+nameOrID) | ||
| if err2 != nil { | ||
| ref3, err3 := istorage.Transport.ParseStoreReference(svc.store, nameOrID) | ||
| if err3 != nil { | ||
| return err | ||
| } | ||
| ref2 = ref3 | ||
| } | ||
| ref = ref2 | ||
| } | ||
| return ref.DeleteImage(systemContext) | ||
| } | ||
|
|
||
| func (svc *imageService) GetStore() storage.Store { | ||
| return svc.store | ||
| } | ||
|
|
||
| // GetImageService returns an ImageServer that uses the passed-in store, and | ||
| // which will prepend the passed-in defaultTransport value to an image name if | ||
| // a name that's passed to its PullImage() method can't be resolved to an image | ||
| // in the store and can't be resolved to a source on its own. | ||
| func GetImageService(store storage.Store, defaultTransport string) (ImageServer, error) { | ||
| if store == nil { | ||
| var err error | ||
| store, err = storage.GetStore(storage.DefaultStoreOptions) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| return &imageService{ | ||
| store: store, | ||
| defaultTransport: defaultTransport, | ||
|
Member
There was a problem hiding this comment. see my other comments around |
||
| }, nil | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing comment on
GetStore()There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding.