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

Multiple fixes for ONBUILD behavior #5397

Merged
merged 3 commits into from
Oct 4, 2024
Merged

Conversation

tonistiigi
Copy link
Member

dockerfile: fix command count after new commands from ONBUILD

Fix progress lines like [6/4] step

dockerfile: mark commands invoked from ONBUILD with prefix

dockerfile: set error location for ONBUILD errors

Set error location for ONBUILD errors to the command
that pulled in the image with ONBUILD definitions.

Currently location was incorrectly set to the first
line as ONBUILD was parsed as a separate source code.

Location is handled both at parse time (for invalid
ONBUILD definition) and run time (when command set
via ONBUILD errors).

Fix progress lines like `[6/4] step`

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Set error location for ONBUILD errors to the command
that pulled in the image with ONBUILD definitions.

Currently location was incorrectly set to the first
line as ONBUILD was parsed as a separate source code.

Location is handled both at parse time (for invalid
ONBUILD definition) and run time (when command set
via ONBUILD errors).

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Copy link
Member

@crazy-max crazy-max left a comment

Choose a reason for hiding this comment

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

Ah didn't catch the wrong count when I was testing 🙈

@tonistiigi tonistiigi merged commit ce43466 into moby:master Oct 4, 2024
92 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.

3 participants