dockerfile from stdin #440
Merged
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
AkihiroSuda
reviewed
Oct 18, 2021
cmd/nerdctl/build.go
Outdated
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| defer os.RemoveAll(tempDockerfile) |
There was a problem hiding this comment.
nit: only if tempDockerfile != ""
AkihiroSuda
reviewed
Oct 18, 2021
cmd/nerdctl/build.go
Outdated
| dir, file = filepath.Split(filename) | ||
| } | ||
|
|
||
| if dockerfileReader != nil { |
There was a problem hiding this comment.
You can merge this if dockerfileReader != nil to if filename == "-"
AkihiroSuda
reviewed
Oct 18, 2021
cmd/nerdctl/build.go
Outdated
| return "", nil, false, "", err | ||
| } | ||
| file = buildkitutil.DefaultDockerfileName | ||
| tempDockerfile = dir |
There was a problem hiding this comment.
tempDockerfile looks misnomer. Probably called like tempDockerfileDir
AkihiroSuda
reviewed
Oct 18, 2021
cmd/nerdctl/build_test.go
Outdated
| CMD ["echo", "nerdctl-build-test-stdin"] | ||
| `, testutil.AlpineImage) | ||
|
|
||
| base.Cmd("build", "-t", imageName, "-f", "-", ".").CmdOption(testutil.WithStdin(strings.NewReader(dockerfile))).AssertOK() |
There was a problem hiding this comment.
AssertOut("nerdctl-build-test-stdin")
AkihiroSuda
reviewed
Oct 18, 2021
cmd/nerdctl/build.go
Outdated
| @@ -118,50 +121,51 @@ func buildAction(cmd *cobra.Command, args []string) error { | |||
| return nil | |||
| } | |||
|
|
|||
| func generateBuildctlArgs(cmd *cobra.Command, args []string) (string, []string, bool, error) { | |||
| func generateBuildctlArgs(cmd *cobra.Command, args []string) (string, []string, bool, string, error) { | |||
There was a problem hiding this comment.
This should probably return cleanup func() error rather than string
|
Please squash commits |
fahedouch
force-pushed
the
build-from-stdin
branch
2 times, most recently
from
e00d10f
to
6c483da
Compare
|
@AkihiroSuda done |
fahedouch
force-pushed
the
build-from-stdin
branch
3 times, most recently
from
d773d34
to
8ac9454
Compare
Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>
fahedouch
force-pushed
the
build-from-stdin
branch
from
8ac9454
to
bd178f7
Compare
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
|
LGTM, thanks. Added a commit to use a permalink in |
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.
fixing #387
Signed-off-by: fahed dorgaa fahed.dorgaa@gmail.com