Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Store artifact image as oci-dir #108

Merged
merged 62 commits into from
May 9, 2024
Merged

Store artifact image as oci-dir #108

merged 62 commits into from
May 9, 2024

Conversation

termoshtt
Copy link
Owner

@termoshtt termoshtt commented Apr 15, 2024 •
edited
Loading

  • image::{Artifact, Builder} are introduced to represent ocipkg's artifact and its builder.
    • This supports application/vnd.ocipkg.v1.artifact and old style artifact used in 0.2.x. It is called v0 format.
  • The manifest and blobs stored in local storage by Store Manifest JSON and blobs #107 has been changed also in this PR. They are stored as usual oci-dir format:
.
├── libocipkg_static_rust.a
└── .oci-dir
    ├── blobs
    │   └── sha256
    │       ├── 7299ae02d5a3ac14e45c62670341d869f4cb3b41eebbfa59acbcfdc6e864288a
    │       ├── b9a51607f9fbe50601a623cf5060506dee43798db9e1ccc014404edffd2b5c2b
    │       └── 2aedb7a0fd572b2cd4dd3408f7f83642f76ced60308db082470c76ed52d3845c
    └── index.json

@termoshtt termoshtt self-assigned this Apr 15, 2024
@termoshtt termoshtt changed the title OCI Artifact support OCI Artifact support based on OCI image spec 1. Apr 15, 2024
@termoshtt termoshtt changed the title OCI Artifact support based on OCI image spec 1. OCI Artifact support based on OCI image spec 1.1 Apr 15, 2024
@termoshtt
impl ArtifactWriter for LocalArtifact
4b2efbc
@termoshtt
ArtifactWriter::{add_file, add_directory}
a097b4c
@termoshtt
LocalArtifactBuilder
c34ab04
@termoshtt
oci_dir submodule
ee9caa2
@termoshtt
Use LocalOciDirBuilder in LocalArtifactBuilder
622cb57
@termoshtt
Compress files and directories
26eb347
@termoshtt
clippy fix
c8c7e69
@termoshtt
Use LocalOciDirBuilder in get_image
51cfaee
@termoshtt
Re-export oci_spec
b52736f
@termoshtt
Rename LocalOciDirBuilder to OciDirBuilder and update the documen…
5f8bc8f 
…tation to reflect the change.
@termoshtt
Remove oci-dir if it is not finished
201ee9d
@termoshtt
Store .oci-dir
e9f9684
@termoshtt
Move oci_dir.rs to image/layout.rs
58db600
@termoshtt
Fix
88e0b73
@termoshtt
OciArchiveBuilder
54312b0
@termoshtt
Split into oci_archive.rs and oci_dir.rs
43088ed
@termoshtt
Introduce ImageLayout and ImageLayoutBuilder traits
bd5f4a1
@termoshtt
OciDir
d85aa53
@termoshtt
OciArchive
6350ffd
@termoshtt
clippy fix
2527039
@termoshtt
Format
36f35ed
@termoshtt
impl ImageLayoutBuilder for OciDirBuilder
240628d
@termoshtt
Rewind
8320a61
@termoshtt termoshtt mentioned this pull request Apr 25, 2024
Merged
termoshtt added a commit that referenced this pull request Apr 25, 2024
@termoshtt
application/vnd.ocipkg.v1.artifact as OCI Artifact (#116)
5737456 
Split from #108 

This PR introduces three media types,
`application/vnd.ocipkg.v1.{artifact,config+json,layer.tar+gzip}`:

- `application/vnd.ocipkg.v1.artifact` is set as `artifactType` in [OCI
Image
Manifest](https://github.com/opencontainers/image-spec/blob/v1.1.0/manifest.md).
Manifest with this type must satisfying followings:
- `config` must be `application/vnd.ocipkg.v1.config+json`. This is a
map from the digest of layer to file path list contained the layer like:
    ```json
    {
      "layers": {

"sha256:9b56444eec38adba2fbf7381ed832de98489045c6b322e36388b8ba29ebac595":
[
          "test/Dockerfile",
          "test/fixture.sh"
        ]
      }
    }
    ```
- `layers` must be a list of descriptors with
`application/vnd.ocipkg.v1.layer.tar+gzip` media type
termoshtt added a commit that referenced this pull request May 7, 2024
@termoshtt
Rename ArtifactBuilder to OciArtifactBuilder, and introduce `OciA…
9a042e8 
…rtifact` (#126)

Split from #108 

- `ArtifactBuilder` will be used for building ocipkg artifact instead of
OCI Artifact in #108
@termoshtt
Merge branch 'main' into oci-artifact
910b3b7
@termoshtt
Fix merge bug
8bc1e06
@termoshtt
Artifact::files
fabe6ef
@termoshtt
ImageLayout::unpack
f47949d
@termoshtt
clippy fix
d8d18ad
@termoshtt
Artifact::unpack
ffe7050
@termoshtt
format
8a4e161
@termoshtt
Remove unused pat
c45b0c7
@termoshtt
Drop unused
495d420
@termoshtt
Initializer Artifact::from_oci_{archive, dir}
c80a48f
@termoshtt
Use Artifact instead of read::Archive
ff291f3
@termoshtt
Use the new Artifact API to inspect the contents of an OCI artifact.
f2225f6
@termoshtt
Remove image::read
7759018
@termoshtt
Add test to get new style artifact
b799669
@termoshtt
Merge branch 'main' into oci-artifact
3f24540
@termoshtt
Replace Image::unpack by image::copy
d06f99c
@termoshtt
Use Artifact::unpack for get_image
5efaadf
@termoshtt
Re-support v0 format
b4357a0
@termoshtt
More support for V0 artifact format
51b79e5
@termoshtt
Check artifact version on get_ocipkg_config
113881c
@termoshtt
Merge ocipkg list test into ocipkg get test
7a47997
@termoshtt
Remove fs_extra from Cargo.toml and Cargo.lock
35af68b
@termoshtt
Test doc links
36caa2a
@termoshtt
Fix doc
2cb8dd1
@termoshtt termoshtt marked this pull request as ready for review May 9, 2024 11:57
@termoshtt termoshtt merged commit 8c30a0d into main May 9, 2024
14 checks passed
@termoshtt termoshtt deleted the oci-artifact branch May 9, 2024 11:58
@termoshtt termoshtt added the change Change existing functionality. label May 9, 2024
@termoshtt termoshtt mentioned this pull request May 9, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@termoshtt termoshtt

Labels
change Change existing functionality.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@termoshtt