Skip to content

ctr images import: add --no-unpack option#3259

Merged
estesp merged 1 commit intocontainerd:masterfrom
BenTheElder:no-unpack
May 5, 2019
Merged

ctr images import: add --no-unpack option#3259
estesp merged 1 commit intocontainerd:masterfrom
BenTheElder:no-unpack

Conversation

@BenTheElder
Copy link
Copy Markdown
Contributor

Implements #3258. ctr images import ... with the new --no-unpack option will return after Import, skipping image Unpack.

This can be used to import images into the content store for E.G. VM image baking without unpacking them to a snapshotter.

Signed-off-by: Benjamin Elder [email protected]

@BenTheElder
Copy link
Copy Markdown
Contributor Author

cc @Random-Liu

I'm not sure if this is the right naming convention etc. or what else I should do, but the change is so trivial that I went ahead and filed it after reading CONTRIBUTING.md and filing #3258 😅

@codecov-io
Copy link
Copy Markdown

codecov-io commented May 1, 2019

Codecov Report

Merging #3259 into master will decrease coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3259      +/-   ##
==========================================
- Coverage   44.63%   44.61%   -0.03%     
==========================================
  Files         113      113              
  Lines       12164    12219      +55     
==========================================
+ Hits         5430     5451      +21     
- Misses       5899     5932      +33     
- Partials      835      836       +1
Flag Coverage Δ
#linux 48.65% <ø> (ø) ⬆️
#windows 39.9% <ø> (+0.02%) ⬆️
Impacted Files Coverage Δ
services/server/server.go 1.12% <0%> (-0.14%) ⬇️
metadata/content.go 46.01% <0%> (+2.03%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a17c809...cb7c780. Read the comment docs.

Comment thread cmd/ctr/commands/images/import.go Outdated
@aojea
Copy link
Copy Markdown
Contributor

aojea commented May 3, 2019

There are other jobs failing with the same error and this patch doesn't seem to be related to the error, is it possible that the test is flaky? how can we retrigger the failed job?

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@Random-Liu
Copy link
Copy Markdown
Member

LGTM

@fuweid
Copy link
Copy Markdown
Member

fuweid commented May 5, 2019

@BenTheElder you can push again to rerun the CI 😂

Basically, your change is not related to the flaky test case. But we need the CI green.

@estesp
Copy link
Copy Markdown
Member

estesp commented May 5, 2019

All green now; I restarted the Windows CI

@BenTheElder you can push again to rerun the CI 😂

Basically, your change is not related to the flaky test case. But we need the CI green.

@estesp estesp merged commit d71c7ad into containerd:master May 5, 2019
@BenTheElder
Copy link
Copy Markdown
Contributor Author

BenTheElder commented May 5, 2019 via email

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.

7 participants