dockerfile: add syntax directive for introducing new features #384
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
tonistiigi
force-pushed
the
syntax-directive
branch
from
4d9ba59
to
d4d57dd
Compare
tiborvass
reviewed
May 14, 2018
| m := map[string]string{} | ||
| s := bufio.NewScanner(r) | ||
| for s.Scan() { | ||
| match := reDirective.FindStringSubmatch(s.Text()) |
There was a problem hiding this comment.
Needs to handle uppercase too, so it should be strings.ToLower(s.Text()) or reDirective.FindSubmatch(bytes.ToLower(s.Bytes())) (and then cast string(m) and string(match[2]))
There was a problem hiding this comment.
Or just change the regexp.
tonistiigi
force-pushed
the
syntax-directive
branch
from
d4d57dd
to
a6ea1c3
Compare
AkihiroSuda
reviewed
May 15, 2018
frontend/dockerfile/builder/build.go
Outdated
| @@ -116,6 +116,13 @@ func Build(ctx context.Context, c client.Client) error { | |||
| return err | |||
| } | |||
|
|
|||
| if _, ok := c.Opts()["cmdline"]; !ok { | |||
| ref, argv, ok := dockerfile2llb.DetectSyntax(bytes.NewBuffer(dtDockerfile)) | |||
There was a problem hiding this comment.
nit: I expect argv to be a vector (slice)
There was a problem hiding this comment.
Do I just rename the var to cmdline?
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
tonistiigi
force-pushed
the
syntax-directive
branch
from
a6ea1c3
to
460fb33
Compare
|
LGTM |
AkihiroSuda
approved these changes
May 16, 2018
|
#382 needs to be merged first? |
|
merging into master (#382 llbsolver-next is merged now) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add syntax directive for specifying the builder reference so that new dockerfile features can be targeted. New Dockerfile features can be added now without breaking backward compatibility or requiring users to upgrade. The base one would remain compatible with current moby/docker.
@tiborvass
Signed-off-by: Tonis Tiigi tonistiigi@gmail.com