github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
4,910 Commits 3 Branches 4 Tags
8a6190856bb84c4e340527c2404b1123791bab13
Commit Graph

97 Commits

Author SHA1 Message Date
Phil Estes
29930e9185 Merge pull request #3455 from dmcgowan/fix-default-import-compression 
Add option to compress blobs on import
 2019-07-25 16:45:11 -04:00
Derek McGowan
02826345cf Add option to compress blobs on import 
Change the default back to leave uncompressed and add
option to do the compression.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-07-25 12:05:38 -07:00
Brandon Lum
3d1fa69694 Implemented constructors for both encryption and decryption 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2019-07-24 22:19:39 -04:00
Stefan Berger
364de4c35d Wrap creation of CryptoConfig in constructors 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
 2019-07-23 19:53:23 -04:00
Brandon Lum
c6d437fd70 Corrected lease implementation 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2019-07-18 18:17:20 -04:00
Brandon Lum
c00517a94c Made fixes and optimizations to encryption GC 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2019-07-18 15:15:32 -04:00
Phil Estes
c90a3d4932 Merge pull request #3134 from stefanberger/encryption_code_plus_ctr.pr 
Add image encryption support and ctr support
 2019-07-17 15:47:12 -04:00
Derek McGowan
dde436e65b Crypto library movement and changes to content helper interfaces 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-07-17 15:21:29 -04:00
Stefan Berger
bf8804c743 Implemented image encryption/decryption libraries and ctr commands 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2019-07-17 15:19:58 -04:00
Phil Estes
129942ca4d Merge pull request #3135 from dmcgowan/archive-importer-docker-types 
Compress import blobs in Docker compatibility code
 2019-07-17 09:25:40 -04:00
Michael Crosby
b5d0c78225 Merge pull request #3406 from fuweid/me-update-Manifest 
images: only fetch the best matched manifest info
 2019-07-16 15:32:09 -04:00
Maksym Pavlenko
ef7f46eb7b Fix linter errors 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-07-14 20:49:40 -07:00
Wei Fu
d643f1dc88 images: only fetch the best matched manifest info 
When client uses Pull action to pull image, it will limit the number of
manifest as one. But Unpack action will call Manifest to traverse all
the manifests including non-dowloaded one. If the platform has more than
one manifest, the Pull with unpack action will fail. And also, there is
no need to read non-best matched manifest. Therefore, the Manifest can
do the sort earlier.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-07-12 22:34:43 -04:00
Derek McGowan
5e2d7efd82 Use a single custom annotation for export 
Remove annotation prefix and add multiple index records
for manifests with multiple image names. This makes the
custom annotation more consistent with the OCI image
annotation. Additionally, ensure the OCI image annotation
always represents the tag (partial image name) as recommended
by the specification. The containerd image name annotation
will always contain the full image name.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-05-21 17:21:26 -07:00
Wei Fu
e61f7f4913 Merge pull request #3172 from dmcgowan/export-docker-compatibility 
Update image export to support Docker format
 2019-05-17 14:30:54 +08:00
Davor Kapsa
cfc36388b3 Remove redundant error checks 
Signed-off-by: Davor Kapsa <davor.kapsa@gmail.com>
 2019-04-30 21:28:51 +02:00
Derek McGowan
4754d2aeee Update image export to support Docker format 
Add manifest.json file which is used by Docker
to import images.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-04-04 15:23:06 -07:00
Derek McGowan
8d1ae237eb Always add compressed blobs to Docker import manifest 
Ensure the manifest which gets created using the Docker
compatibility code compresses the blob before creating
the manifest. This ensures consistency with manifests
used by Docker.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-04-04 10:35:01 -07:00
Sebastiaan van Stijn
525802f9ce Use distribution's reference.ParseDockerRef 
Using the cri utility caused other project to have
containerd/cri as a dependency, only for this utility.

The new `reference.ParseDockerRef` function does the
same (other than having a different name).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-02-07 13:13:25 +01:00
Lantao Liu
d7ed403072 Add image pull concurrency limit. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-29 10:27:05 -08:00
Phil Estes
b444d7d507 Handle additional cleanups from prior PR 
Update comment and streamline getting the default platform spec

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-01-16 13:07:29 -05:00
kadisi
40267382c5 fix ctr image export not found error 
Signed-off-by: Jie Zhang <iamkadisi@163.com>
 2018-12-17 08:52:28 +08:00
Evan Hazlett
6f2f4e4343 checkpoint: add copts to checkpoint; save snapshotter to annotation 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:48:16 +00:00
Evan Hazlett
147208061c add image name and runtime name media types; remove task operation on checkpoint 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:47:17 +00:00
Evan Hazlett
45c700a955 refactor checkpoint and restore to client 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:45:22 +00:00
Gábor Lipták
9d01160902 Correct spelling 
Signed-off-by: Gábor Lipták <gliptak@gmail.com>
 2018-10-19 17:06:43 -04:00
Phil Estes
90b7b88e10 Merge pull request #2696 from dmcgowan/import-docker-tar-test 
Content store fix and import integration test
 2018-10-03 09:57:25 +02:00
Derek McGowan
b6107dca86 Add import integration test 
Move tar creation test utilities to separate package
Test all supported formats for import

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-10-01 11:47:10 -07:00
Derek McGowan
ef8498bf79 Update manifest resolution for non-index manifests 
Avoid filtering manifests by platform when a non-index
manifest is provided to the Manifest function.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-25 17:50:06 -07:00
Derek McGowan
da6d29033c Clean up error messages 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-17 14:41:43 -07:00
Derek McGowan
a62be324b7 Unify docker and oci importer 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-17 14:41:43 -07:00
Derek McGowan
bce20b75da Simplify docker importer 
Support any layout and rely on manifest.json to reference blobs

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-14 14:21:27 -07:00
Derek McGowan
9e6db71954 Add docker importer 
Update ctr to support all formats by default

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-14 14:21:26 -07:00
Derek McGowan
f57c5cdefb Refactor image importer 
Allow customization of reference creation.
Add option for digest references.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-14 14:21:26 -07:00
Derek McGowan
3d1082e06d Add a manifest filter limiting the number of matches 
Adds a manifest filter for pulling which ensures only one
manifest from a manifest list is pulled even when multiple matches.
Removes unused filter platform list.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-08-27 17:03:55 -07:00
Derek McGowan
9edcfcc1cb Add platform match comparer interface 
Adds a new platform interface for matching and comparing platforms.
This new interface allows both filtering and ordering of platforms
to support running multiple platform and choosing the best platform.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-08-27 00:11:46 -07:00
Tonis Tiigi
82e7204a3c oci-exporter: do not filter current platform on export 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-07-13 17:08:01 -07:00
Tonis Tiigi
53fe31d6de images: provide better error for manifest list match error 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-20 13:43:27 -07:00
Vincent Demeester
832b05ae67 Update tests to use gotest.tools angel 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-08 21:02:01 +02:00
Akihiro Suda
d88de4a34f content: change Writer/ReaderAt to take OCI 
This change allows implementations to resolve the location of the actual data
using OCI descriptor fields such as MediaType.

No OCI descriptor field is written to the store.

No change on gRPC API.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-06-01 11:51:43 +09:00
Michael Wan
7fd6d5e2be fix words misspell 
Signed-off-by: Michael Wan <zirenwan@gmail.com>
 2018-04-23 00:09:42 -04:00
Jess Valarezo
c3cf3d7822 allow content to be pulled for specific platform(s), all platforms 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2018-03-12 17:31:42 -07:00
Jess Valarezo
ac8008437a update platforms Parse to return platform spec, decouple matcher 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2018-02-27 14:21:49 -08:00
Kunal Kushwaha
b12c3215a0 Licence header added 
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2018-02-19 10:32:26 +09:00
Daniel Nephin
3279acca82 Check timestamps in snapshot storage test suite 
also use t.Helper()
convert assertions to canonical

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2018-02-12 12:26:26 -05:00
Daniel Nephin
ef48a0268e Migrate to gotestyourself/assert 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2018-02-12 12:26:26 -05:00
Michael Crosby
5471ba9445 Merge pull request #2117 from dmcgowan/update-fetch-handlers 
content: support manifest labeling on completed content ingests on the client
 2018-02-12 11:08:14 -05:00
Derek McGowan
944a9ade37 Update fetch handling 
Fix issue where manifest content must always be fetched
even if it is already fully downloaded or shared locally.
Simplify children label setting and platform filtering.
Prevent getting a fetcher when content shared locally.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-02-09 14:33:14 -08:00
Akihiro Suda
ee70879202 *: use narrower content interfaces 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-02-09 19:52:52 +09:00
Michael Crosby
d179c61231 Revert "Use jsoniteer for faster json encoding/decoding" 
This reverts commit 4233b87b89.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-01-29 15:47:48 -05:00