-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
Avoid nil pointer dereference when copying from image with no layers #2197
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
799175f
Avoid nil pointer dereference when copying from image with no layers
aaronlehmann e70f855
Add test for copying from scratch
aaronlehmann 8f2fd48
Check that scratch is mounted as empty dir
aaronlehmann c1a48b7
Make error message consistent when layer is empty
aaronlehmann a018bf5
Test with tonistiigi/test:nolayers as well
aaronlehmann File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -93,6 +93,7 @@ func TestIntegration(t *testing.T) { | |
testBasicRegistryCacheImportExport, | ||
testBasicLocalCacheImportExport, | ||
testCachedMounts, | ||
testCopyFromScratch, | ||
testProxyEnv, | ||
testLocalSymlinkEscape, | ||
testTmpfsMounts, | ||
|
@@ -2944,6 +2945,39 @@ func testCacheMountNoCache(t *testing.T, sb integration.Sandbox) { | |
require.NoError(t, err) | ||
} | ||
|
||
func testCopyFromScratch(t *testing.T, sb integration.Sandbox) { | ||
requiresLinux(t) | ||
c, err := New(sb.Context(), sb.Address()) | ||
require.NoError(t, err) | ||
defer c.Close() | ||
|
||
st := llb.Scratch().File(llb.Copy(llb.Scratch(), "/", "/")) | ||
def, err := st.Marshal(sb.Context()) | ||
require.NoError(t, err) | ||
|
||
_, err = c.Solve(sb.Context(), def, SolveOpt{}, nil) | ||
require.NoError(t, err) | ||
|
||
st = llb.Scratch().File(llb.Copy(llb.Scratch(), "/foo", "/")) | ||
def, err = st.Marshal(sb.Context()) | ||
require.NoError(t, err) | ||
|
||
_, err = c.Solve(sb.Context(), def, SolveOpt{}, nil) | ||
require.Error(t, err) | ||
require.Contains(t, err.Error(), "/foo: no such file or directory") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. regarding errors, if I change |
||
|
||
busybox := llb.Image("busybox:latest") | ||
|
||
out := busybox.Run(llb.Shlex(`sh -e -c '[ $(ls /scratch | wc -l) = '0' ]'`)) | ||
out.AddMount("/scratch", llb.Scratch(), llb.Readonly) | ||
|
||
def, err = out.Marshal(sb.Context()) | ||
require.NoError(t, err) | ||
|
||
_, err = c.Solve(sb.Context(), def, SolveOpt{}, nil) | ||
require.NoError(t, err) | ||
} | ||
|
||
// containerd/containerd#2119 | ||
func testDuplicateWhiteouts(t *testing.T, sb integration.Sandbox) { | ||
skipDockerd(t, sb) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: probably better to return the same "not found" error that would happen if
p
does not exist. "empty reference" is an internal concept, users of build don't know what it means