Default to image entrypoint for infra container #2590
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
|
fixes: #2182 |
|
LGTM |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: haircommander, rhatdan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
mheon
reviewed
Mar 8, 2019
libpod/runtime_pod_infra_linux.go
Outdated
| // default to entrypoint in image if there is one | ||
| if len(data.Config.Entrypoint) > 0 { | ||
| entryCmd = data.Config.Entrypoint | ||
| } |
There was a problem hiding this comment.
While you're in here - can we also grab the image's environment variables and add them? Makes the infra container more of a standard container
There was a problem hiding this comment.
done, though the code is kind of clunky
haircommander
force-pushed
the
pause_entry_cmd
branch
from
9b2d9ce
to
16760ab
Compare
If the pod infra container is overriden, we want to run the entry point of the image, instead of the default infra command. This allows users to override the infra-image with greater ease. Also use process environment variables from image Signed-off-by: Peter Hunt <[email protected]>
haircommander
force-pushed
the
pause_entry_cmd
branch
from
16760ab
to
dff224a
Compare
|
LGTM |
|
/lgtm |
github-actions
bot
added
the
locked - please file new issue/PR
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.
If the pod infra container is overriden, we want to run the entry point of the image, instead of the default infra command. This allows users to override the infra-image with greater ease.
Signed-off-by: Peter Hunt [email protected]