This repository has been archived by the owner on Jan 8, 2024. It is now read-only.
Only inject/append Entrypoint if it's not already there #2447
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
catsby
added
core
pr/no-changelog
catsby
commented
Oct 7, 2021
| if entryPoint == "/waypoint-entrypoint" { | ||
| found = true | ||
| s.Logger.Debug("waypoint-entrypoint found, not injecting") | ||
| break |
There was a problem hiding this comment.
Intentionally didn't use the new containsEntrypoint function here to avoid including a new package (which at one point gave me a circular dependency issue, but that may be resolved)
catsby
removed
the
pr/no-changelog
evanphx
suggested changes
Oct 7, 2021
evanphx
suggested changes
Oct 7, 2021
catsby
force-pushed
the
single-entrypoint-append
branch
from
783eb0a
to
65fdf2d
Compare
catsby
force-pushed
the
single-entrypoint-append
branch
from
65fdf2d
to
600a1b5
Compare
catsby
force-pushed
the
single-entrypoint-append
branch
from
600a1b5
to
b3f56cb
Compare
mitchellh
approved these changes
Oct 8, 2021
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.
Currently the
waypoint-entrypointbinary is injected into the container and appended to the front of itsEntrypointdefinition (as long asdisable_entrypointisfalse).In the case of using
docker-pullin thebuildphase, if the image we pull already has the entrypoint included, this will result in a chain of entrypoints as well as additional layers in the image (see #2381).In this PR, if a container already includes an entry for
/waypoint-entrypointin itsEntrypointdefinition, then don't inject it again. We assume that if it is already included in theEntrypointdefinition, that the binary also exists in the container.Fixes #2381