This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
forked from moby/moby
-
Notifications
You must be signed in to change notification settings - Fork 424
[18.09 backport] fix panic on empty dockerfile #199
Merged
andrewhsu
merged 4 commits into
docker-archive:18.09
from
thaJeztah:18.09_backport_fix_panic_on_empty_dockerfile
Jun 18, 2019
Merged
[18.09 backport] fix panic on empty dockerfile #199
andrewhsu
merged 4 commits into
docker-archive:18.09
from
thaJeztah:18.09_backport_fix_panic_on_empty_dockerfile
Jun 18, 2019
Conversation
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
Member
thaJeztah
commented
Apr 20, 2019
•
edited
Loading
edited
- bump buildkit 05766c5c21a1e528eeb1c3522b2f05493fe9ac47 (docker-18.09 branch)
- [18.09 backport] Have parser error on dockerfiles without instructions moby/buildkit#952 [18.09 backport] Have parser error on dockerfiles without instructions
- backport of Have parser error on dockerfiles without instructions moby/buildkit#771 Have parser error on dockerfiles without instructions
- [18.09 backport] Have parser error on dockerfiles without instructions moby/buildkit#952 [18.09 backport] Have parser error on dockerfiles without instructions
- Error on empty dockerfile moby/moby#38487 Error on empty dockerfile
- first two commits (last commit (vendor bump) is replaced with the bump above)
ping @tonistiigi @LinuxMercedes ptal |
The failures looks unrelated:
|
Ah, yes, I forgot the fix for that isn't merged yet; the fix for that is included in #198 😓 |
Ah! Looks good otherwise! 👍 |
thaJeztah
force-pushed
the
18.09_backport_fix_panic_on_empty_dockerfile
branch
from
April 23, 2019 17:40
b3b89f2
to
ea4aef0
Compare
rebased, now that #198 was merged |
Failures so far look flaky:
|
Oh, that janky failure is related. You'd need to include moby#38524 or backport docker/docker-py#2216 to whatever version of docker-py is included in this release. |
Oh, good catch thanks! opened a separate PR for that one #202 |
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit c0c05af) Signed-off-by: Sebastiaan van Stijn <[email protected]>
…branch) - moby/buildkit#952 [18.09 backport] Have parser error on dockerfiles without instructions - backport of moby/buildkit#771 Have parser error on dockerfiles without instructions Signed-off-by: Sebastiaan van Stijn <[email protected]>
- Wrap parse errors in errdefs.InvalidParameters - Include dockerfile in error names Signed-off-by: Natasha Jarus <[email protected]> (cherry picked from commit 64466b0) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Natasha Jarus <[email protected]> (cherry picked from commit 18c7e8b) Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
18.09_backport_fix_panic_on_empty_dockerfile
branch
from
June 18, 2019 12:44
ea4aef0
to
cd084b2
Compare
rebased on top of #202 to get both changes in here |
andrewhsu
approved these changes
Jun 18, 2019
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.
LGTM
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.