Skip to content

Fix containerdServiceOpt type#54

Open
SamWhited wants to merge 73 commits intodmcgowan:containerd-integrationfrom
SamWhited:minor_test_fixes
Open

Fix containerdServiceOpt type#54
SamWhited wants to merge 73 commits intodmcgowan:containerd-integrationfrom
SamWhited:minor_test_fixes

Conversation

@SamWhited
Copy link
Copy Markdown

Minor fix to one of the types in the service tests.

Tibor Vass and others added 30 commits July 2, 2019 21:41
This reverts commit f695e98.

Signed-off-by: Tibor Vass <tibor@docker.com>
This reverts commit 0811297.

Signed-off-by: Tibor Vass <tibor@docker.com>
This reverts commit f23a51a.

Signed-off-by: Tibor Vass <tibor@docker.com>
Manifest v2 schema1 was deprecated in 4866f5139a1 and this commit
removes the push code for v2 schema1.

Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Use cache for delete and listing images

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Fix conflict and update removal to use cache and not stores.
Layer removal is still missing.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Unpack and delete layers

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Updates info functions to query the containerd image cache.
Updates related call stack to pass down context.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Anda Xu <axu@knox.edu>
Fix dangling image management to not rely on reference parsing

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Fix layer references being taken on startup

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Uses containerd client to push.
Temporarily resolves current platform on push to match current behavior.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Lookup images without using caching

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Adds equivalent label as the snapshotter gc label

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Anda Xu <axu@knox.edu>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Anda Xu <axu@knox.edu>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Make layer stores multiplatform and allow configuring
multiple ordered by preference.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Support for multiple unpacks

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Filter pull artifacts by platform while pulling
all manifests and configs.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
dmcgowan and others added 26 commits August 20, 2019 10:58
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Anda Xu <axu@knox.edu>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
The entire package is now deprecated, revert temporary
changes.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Anda Xu <axu@knox.edu>
Fix build

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This is to avoid nil pointer dereference.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This migrates image store to containerd.

To test:
 # sudo DOCKER_MIGRATE_IMAGE_STORE=da ./bundles/dynbinary-daemon/dockerd-dev

To re-test:
 # ctr -n moby image ls -q | xargs ctr -n moby image rm
 # ctr -n moby content ls -q | xargs ctr -n moby content rm

TODO:
 - find a better place for this code
 - maybe some tests?

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Anda Xu <axu@knox.edu>
fix already exists error during image tagging

Signed-off-by: Anda Xu <axu@knox.edu>
Remove image store instantiation from image service

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Move logic to image service and merge with cache loading.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Replace use of image id with descriptor

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Update load to use full image name annotation

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Prevent panics on unimplemented code and remove
unnecessary lookups on commit.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Sam Whited <sam@samwhited.com>
@SamWhited SamWhited requested a review from dmcgowan October 3, 2019 17:57
@dmcgowan dmcgowan force-pushed the containerd-integration branch 3 times, most recently from 2bb3716 to 30fb3cb Compare October 9, 2019 20:28
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.

4 participants