Add default PATH Env variable to opts, if image inspect doesn't inclu… #372
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
…de PATH Signed-off-by: HassanAlsamahi <hassanalsamahi12@gmail.com>
AkihiroSuda
reviewed
Sep 18, 2021
cmd/nerdctl/run.go
Outdated
| @@ -336,6 +336,16 @@ func runAction(clicontext *cli.Context) error { | |||
| opts = append(opts, oci.WithProcessCwd(wd)) | |||
| } | |||
|
|
|||
| for ind, env := range ensuredImage.ImageConfig.Env { | |||
There was a problem hiding this comment.
Thanks, but CI failing
=== RUN TestRunCustomRootfs
334
run_test.go:97: assertion failed:
335
Command: /usr/local/bin/nerdctl --namespace=nerdctl-test run --rm --rootfs /tmp/rootfs1612200801 /bin/cat /proc/self/environ
336
ExitCode: 2
337
Error: exit status 2
338
Stdout:
339
Stderr: panic: runtime error: invalid memory address or nil pointer dereference
340
[signal SIGSEGV: segmentation violation code=0x1 addr=0x40 pc=0xda9239]
341
342
goroutine 1 [running]:
343
main.runAction(0xc000109dc0)
344
/go/src/github.com/containerd/nerdctl/cmd/nerdctl/run.go:339 +0x759
345
github.com/urfave/cli/v2.(*Command).Run(0x186e4c0, 0xc000109000)
346
https://github.com/containerd/nerdctl/pull/372/checks?check_run_id=3641485262#step:5:333
There was a problem hiding this comment.
I've fixed the issue, please check.
Signed-off-by: HassanAlsamahi <hassanalsamahi12@gmail.com>
HassanAlsamahi
force-pushed
the
set-path-env-auto
branch
from
7876cb6
to
707bd0d
Compare
fahedouch
reviewed
Sep 19, 2021
| @@ -667,6 +667,15 @@ func generateRootfsOpts(ctx context.Context, client *containerd.Client, cliconte | |||
| containerd.WithNewSnapshot(id, ensured.Image), | |||
| containerd.WithImageStopSignal(ensured.Image, "SIGTERM"), | |||
| ) | |||
| for ind, env := range ensured.ImageConfig.Env { | |||
There was a problem hiding this comment.
loop omited when len(ensured.ImageConfig.Env)=0
There was a problem hiding this comment.
yes, I missed this case, I guess I'll need to check on the ENV slice length first before entering the loop....I'll fix it and push the changes, thanks
There was a problem hiding this comment.
No need to omit the loop. When the slice is empty, the loop just becomes a nop.
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.
fix #356
Adding the PATH environmental variable to the opts passed to the container, if the image inspect is missing the PATH environment variable.
It was tested with:
and it worked as expected.
Please let me know if you have any thoughts, concerns or modifications.