Skip to content
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

dockerfile: fix missing source mapping for COPY --link command #4798

Merged
merged 1 commit into from
Apr 23, 2024

Conversation

tonistiigi
Copy link
Member

The COPY --link command lost its source mapping to the original Dockerfile when converted to LLB vertex. Regression from cc1499e#diff-905097ba6a4e36b3afbb1204e52315791dc0915f2a845c768bc84c6af5db1e1fR1075 progressgroup PR.

@sipsma The previous code is clearly incorrect as it is copying to nil slice (that does nothing), but do check that I didn't miss any progressgroup logic.

@tonistiigi tonistiigi added this to the v0.13.2 milestone Apr 23, 2024
@@ -1340,11 +1340,10 @@ func dispatchCopy(d *dispatchState, cfg copyConfig) error {
copyOpts := []llb.ConstraintsOpt{
llb.Platform(*d.platform),
}
copy(copyOpts, fileOpt)
copyOpts = append(copyOpts, fileOpt...)
Copy link
Member

Choose a reason for hiding this comment

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

Wondering if there is a linter to catch this kind of common mistake

@AkihiroSuda AkihiroSuda merged commit eb26405 into moby:master Apr 23, 2024
72 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants