-
Notifications
You must be signed in to change notification settings - Fork 379
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add reader/writer to for oci-archive multi image
Add read/writer with helpers to allow podman save/load multi oci-archive images. Allow read oci-archive using source_index to point to the an inedx from oci-archive manifest. Signed-off-by: Qi Wang <qiwan@redhat.com>
- Loading branch information
Showing
12 changed files
with
332 additions
and
27 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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,98 @@ | ||
| package archive | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "io/ioutil" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| "github.com/containers/image/v5/internal/tmpdir" | ||
| "github.com/containers/image/v5/oci/layout" | ||
| "github.com/containers/image/v5/types" | ||
| "github.com/containers/storage/pkg/archive" | ||
| imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| // Reader keeps the temp directory the oci archive will be untarred to and the manifest of the images | ||
| type Reader struct { | ||
| manifest *imgspecv1.Index | ||
| tempDirectory string | ||
| } | ||
|
|
||
| // NewReader creates the temp directory that keeps the untarred archive from src. | ||
| // The caller should call .Close() on the returned object. | ||
| func NewReader(ctx context.Context, src string, sys *types.SystemContext) (*Reader, error) { | ||
| // TODO: This can take quite some time, and should ideally be cancellable using a context.Context. | ||
| arch, err := os.Open(src) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| defer arch.Close() | ||
|
|
||
| dst, err := ioutil.TempDir(tmpdir.TemporaryDirectoryForBigFiles(sys), "oci") | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "error creating temp directory") | ||
| } | ||
|
|
||
| reader := Reader{ | ||
| tempDirectory: dst, | ||
| } | ||
|
|
||
| if err := archive.NewDefaultArchiver().Untar(arch, dst, &archive.TarOptions{NoLchown: true}); err != nil { | ||
| if err := reader.Close(); err != nil { | ||
| return nil, errors.Wrapf(err, "error deleting temp directory %q", dst) | ||
| } | ||
| return nil, errors.Wrapf(err, "error untarring file %q", dst) | ||
| } | ||
|
|
||
| indexJSON, err := os.Open(filepath.Join(dst, "index.json")) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| defer indexJSON.Close() | ||
| reader.manifest = &imgspecv1.Index{} | ||
| if err := json.NewDecoder(indexJSON).Decode(reader.manifest); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &reader, nil | ||
| } | ||
|
|
||
| // List returns a (name, reference) map for images in the reader | ||
| // the name will be used to determin reference name of the dest image. | ||
| // the ImageReferences are valid only until the Reader is closed. | ||
| func (r *Reader) List() (map[string]types.ImageReference, error) { | ||
| res := make(map[string]types.ImageReference) | ||
| var ( | ||
| ref types.ImageReference | ||
| err error | ||
| ) | ||
| for i, md := range r.manifest.Manifests { | ||
| if md.MediaType != imgspecv1.MediaTypeImageManifest && md.MediaType != imgspecv1.MediaTypeImageIndex { | ||
| continue | ||
| } | ||
| refName, ok := md.Annotations[imgspecv1.AnnotationRefName] | ||
| if !ok { | ||
| refName = "@" + md.Digest.Encoded() | ||
| if ref, err = layout.NewIndexReference(r.tempDirectory, i); err != nil { | ||
| return nil, err | ||
| } | ||
| } else { | ||
| if ref, err = layout.NewReference(r.tempDirectory, refName); err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| if _, ok := res[refName]; ok { | ||
| return nil, errors.Errorf("image descriptor %s conflict", refName) | ||
| } | ||
| res[refName] = ref | ||
| } | ||
| return res, nil | ||
| } | ||
|
|
||
| // Close deletes temporary files associated with the Reader, if any. | ||
| func (r *Reader) Close() error { | ||
| return os.RemoveAll(r.tempDirectory) | ||
| } |
This file contains 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,54 @@ | ||
| package archive | ||
|
|
||
| import ( | ||
| "io/ioutil" | ||
| "os" | ||
|
|
||
| "github.com/containers/image/v5/directory/explicitfilepath" | ||
| "github.com/containers/image/v5/internal/tmpdir" | ||
| "github.com/containers/image/v5/oci/layout" | ||
| "github.com/containers/image/v5/types" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| // Writer keeps the tempDir for creating oci archive and archive destination | ||
| type Writer struct { | ||
| // tempDir will be tarred to oci archive | ||
| tempDir string | ||
| // user-specified path | ||
| path string | ||
| } | ||
|
|
||
| // NewWriter creates a temp directory will be tarred to oci-archive. | ||
| // The caller should call .Close() on the returned object. | ||
| func NewWriter(sys *types.SystemContext, file string) (*Writer, error) { | ||
| dir, err := ioutil.TempDir(tmpdir.TemporaryDirectoryForBigFiles(sys), "oci") | ||
| if err != nil { | ||
| return nil, errors.Wrapf(err, "error creating temp directory") | ||
| } | ||
| dst, err := explicitfilepath.ResolvePathToFullyExplicit(file) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| ociWriter := &Writer{ | ||
| tempDir: dir, | ||
| path: dst, | ||
| } | ||
| return ociWriter, nil | ||
| } | ||
|
|
||
| // NewReference returns an ImageReference that allows adding an image to Writer, | ||
| // with an optional image name | ||
| func (w *Writer) NewReference(name string) (types.ImageReference, error) { | ||
| return layout.NewReference(w.tempDir, name) | ||
| } | ||
|
|
||
| // Close converts the data about images in the temp directory to the archive and | ||
| // deletes temporary files associated with the Writer | ||
| func (w *Writer) Close() error { | ||
| err := tarDirectory(w.tempDir, w.path) | ||
| if err2 := os.RemoveAll(w.tempDir); err2 != nil && err == nil { | ||
| err = err2 | ||
| } | ||
| return err | ||
| } |
This file contains 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 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
Oops, something went wrong.