Skip to content

Conversation

@runcom
Copy link
Member

@runcom runcom commented Jun 28, 2016

/cc @mtrmac @sgotti

There are still a couple of stuff to be taken care of here but pls review and comment if you can
Most notably we need to take care of containers/skopeo#102 (comment) /cc @mtrmac

Signed-off-by: Antonio Murdaca runcom@redhat.com

@runcom runcom force-pushed the oci-dest branch 2 times, most recently from 7e177a1 to 1a88b53 Compare June 28, 2016 18:12
@mtrmac
Copy link
Collaborator

mtrmac commented Jun 28, 2016

.ACK, pending the MIME type flexibility to make copy work.

@sgotti
Copy link
Member

sgotti commented Jun 28, 2016

Will the creation of the ref and the oci-layout file be added in a future PR? Will the ref be mapped to the docker tag?

return err
}
// TODO(runcom): ugly here?
if err := ioutil.WriteFile(ociLayoutPath(d.dir), []byte(`{"imageLayoutVersion": "1.0.0"}`), 0644); err != nil {
Copy link
Member Author

@runcom runcom Jun 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sgotti what you asked is here, oci-layout and ref which comes from the docker tag/digest in case the ImageSource is a docker ImageSource

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@runcom that means that I shouldn't look at github diffs from a phone 😜

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely :)

@runcom
Copy link
Member Author

runcom commented Jun 29, 2016

rebased to have mime types flexibility bits /cc @mtrmac

@runcom runcom force-pushed the oci-dest branch 2 times, most recently from dd12c91 to e380fa8 Compare June 29, 2016 17:16
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
@runcom runcom changed the title WIP: OCI ImageDestination OCI ImageDestination Jun 29, 2016
@runcom
Copy link
Member Author

runcom commented Jun 29, 2016

@mtrmac ready to review

@mtrmac
Copy link
Collaborator

mtrmac commented Jun 29, 2016

👍 ; please test against skopeo before merging.

Approved with PullApprove

@runcom
Copy link
Member Author

runcom commented Jun 29, 2016

The test against skopeo will be in containers/skopeo#133

@runcom
Copy link
Member Author

runcom commented Jun 29, 2016

skopeo's working fine:

$ ./skopeo copy docker://busybox:latest oci:busybox-latest

$ echo $?
0

$ l busybox-latest 
total 20K
drwxr-xr-x.  4 amurdaca amurdaca 4.0K Jun 29 23:29 .
drwxrwxr-x. 11 amurdaca amurdaca 4.0K Jun 29 23:29 ..
drwxr-xr-x.  2 amurdaca amurdaca 4.0K Jun 29 23:29 blobs
-rw-r--r--.  1 amurdaca amurdaca   31 Jun 29 23:29 oci-layout
drwxr-xr-x.  2 amurdaca amurdaca 4.0K Jun 29 23:29 refs

$ cat busybox-latest/refs/latest 
{"digest":"sha256:77293fa405fdc958b8e9ff8a0a98f9a42b719c97725f77263893707a3e1bea75","mediaType":"application/vnd.oci.image.manifest.v1+json","size":414}%                                                                                     $ cat busybox-latest/blobs/sha256-77293fa405fdc958b8e9ff8a0a98f9a42b719c97725f77263893707a3e1bea75 
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"digest":"sha256:2b8fd9751c4c0f5dd266fcae00707e67a2545ef34f9a29354585f93dac906749","mediaType":"application/octet-stream","size":1459},"layers":[{"digest":"sha256:8ddc19f16526912237dd8af81971d5e4dd0587907234be2b83e249518d5b673f","mediaType":"application/vnd.docker.image.rootfs.diff.tar.gzip","size":667590}],"annotations":null}%      

$ l busybox-latest/blobs 
total 668K
drwxr-xr-x. 2 amurdaca amurdaca 4.0K Jun 29 23:29 .
drwxr-xr-x. 4 amurdaca amurdaca 4.0K Jun 29 23:29 ..
-rw-rw-r--. 1 amurdaca amurdaca 1.5K Jun 29 23:29 sha256-2b8fd9751c4c0f5dd266fcae00707e67a2545ef34f9a29354585f93dac906749
-rw-r--r--. 1 amurdaca amurdaca  414 Jun 29 23:29 sha256-77293fa405fdc958b8e9ff8a0a98f9a42b719c97725f77263893707a3e1bea75
-rw-rw-r--. 1 amurdaca amurdaca 652K Jun 29 23:29 sha256-8ddc19f16526912237dd8af81971d5e4dd0587907234be2b83e249518d5b673f

@runcom
Copy link
Member Author

runcom commented Jun 29, 2016

lgtm

Approved with PullApprove

@runcom runcom merged commit 29b6006 into containers:master Jun 29, 2016
@runcom runcom deleted the oci-dest branch June 29, 2016 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants