This repository has been archived by the owner on Aug 14, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 60
lib: allow relative paths in ImageManifest's App.Exec #114
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
This was referenced Jan 25, 2016
LGTM if it works. |
@@ -440,18 +440,10 @@ func writeACI(layer io.ReadSeeker, manifest schema.ImageManifest, curPwl []strin | |||
} | |||
|
|||
func getExecCommand(entrypoint []string, cmd []string) appctypes.Exec { | |||
var command []string | |||
if entrypoint == nil && cmd == nil { |
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.
Hm, I pushed an old version, this is not needed. If both entrypoint
and cmd
are nil, append(entrypoint, cmd...)
returns nil
already.
Since appc/spec#527 the spec allows relative paths in App.Exec, so we don't need to prepend "/bin/sh -c".
e441438
to
e34a823
Compare
ok, LGTM as well. |
Tested with busybox (it uses a relative path):
|
iaguis
added a commit
that referenced
this pull request
Jan 25, 2016
lib: allow relative paths in ImageManifest's App.Exec
@@ -440,18 +440,7 @@ func writeACI(layer io.ReadSeeker, manifest schema.ImageManifest, curPwl []strin | |||
} | |||
|
|||
func getExecCommand(entrypoint []string, cmd []string) appctypes.Exec { |
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.
can just inline this now..
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.
Since appc/spec#527 the spec allows relative
paths in App.Exec, so we don't need to prepend "/bin/sh -c".