Make the Docker build more re-usable in Cloud #50277
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
|
cc @mieciu |
Closes elastic#49926 and elastic#46166. * Add a mini-init process (copied from Cloud) * Don't use root at all when running the container * Add an explicity TERM handler * Ensure no files in the image have the setuid flag Also improve dependency tracking in the build.
Remove the my_init script in favour of tini, which meant that docker-entrypoint.sh could be cleaned up significantly.
pugnascotia
force-pushed
the
49926-docker-changes-for-ess
branch
from
fac91ba to
91a1ac1
Compare
|
@jordansissel I've replaced the Regarding SIGCHLD, I believe I'm correct in saying that ES treats unexpected termination of ML nodes as a problem, and doesn't restart them. IOW, ES doesn't expect to have to do any child reaping in the normal course of things. It might be worth a conversation with the ML team, my gut feeling is that it's perhaps orthogonal to this change? I still need to make docs changes if we're broadly OK with these changes. |
pugnascotia
changed the title
pugnascotia
added
:Delivery/Packaging
|
Pinging @elastic/es-core-infra (:Core/Infra/Packaging) |
|
@elasticmachine update branch |
dliappis
requested changes
Jan 20, 2020
There was a problem hiding this comment.
Thank you!
This is wonderful work and cleans things up so much.
I asked for a change because we need to update the docs to reflect the removal of TAKE_FILE_OWNERSHIP.
Additionally I think @droberts195 needs to review this to verify that the order of killing is correct (as discussed in #49926 (comment))
droberts195
approved these changes
Jan 20, 2020
There was a problem hiding this comment.
From https://github.com/krallin/tini#process-group-killing I see that:
By default, Tini only kills its immediate child process.
So LGTM from the ML perspective.
|
Aye, I went digging for that exact information before 👍 |
dliappis
approved these changes
Jan 20, 2020
There was a problem hiding this comment.
LGTM.
I mulled over whether we should mark the removal of TAKE_FILE_OWNERSHIP as a breaking change (reference/migration/migrate_8_0.asciidoc) but it really was meant to be used as a last resort as it mutated the bind mount permissions from within the container, so possibly not a big deal.
pugnascotia
added a commit
to pugnascotia/elasticsearch
that referenced
this pull request
Feb 4, 2020
This is to mitigate "stackclash" attacks. This is a a very small partial backport from elastic#50277.
tylersmalley
pushed a commit
to tylersmalley/kibana
that referenced
this pull request
Feb 5, 2020
Based on elastic/elasticsearch#50277 Related to elastic#52450 Signed-off-by: Tyler Smalley <[email protected]>
pugnascotia
added a commit
that referenced
this pull request
Feb 13, 2020
This is to mitigate "stackclash" attacks. This is a a very small partial backport from #50277.
pugnascotia
added a commit
that referenced
this pull request
Apr 24, 2020
Firstly, backport the use of tini as the Docker entrypoint. This was supposed to have been done following #50277, but was missed. It isn't a direct backport as this branch will continue using root as the initial Docker user. Secondly, backport #55491 to use the official checksums when downloading tini.
pugnascotia
added a commit
that referenced
this pull request
Apr 24, 2020
Firstly, backport the use of tini as the Docker entrypoint. This was supposed to have been done following #50277, but was missed. It isn't a direct backport as this branch will continue using root as the initial Docker user. Secondly, backport #55491 to use the official checksums when downloading tini.
pugnascotia
added a commit
to pugnascotia/elasticsearch
that referenced
this pull request
Jul 13, 2022
As part of elastic#50277, we removed the `TAKE_FILE_OWNERSHIP` option from the Docker entrypoint script and the associated chroot calls, and instead just defaulted to running the image as `elasticsearch` instead of `root`. However, we didn't check that it was still possible to pass CLI options to Elasticsearch via CLI arguments, and broke this by mistake. This is probably an uncommon pattern, versus environment variables or a config file. Nevertheless, it is supposed to be possible and is mentioned in the documentation. Fix the problem by suppling the missing positional params when calling Elasticsearch, and add a test case so that we don't break it again.
pugnascotia
added a commit
that referenced
this pull request
Jul 14, 2022
As part of #50277, we removed the `TAKE_FILE_OWNERSHIP` option from the Docker entrypoint script and the associated chroot calls, and instead just defaulted to running the image as `elasticsearch` instead of `root`. However, we didn't check that it was still possible to pass CLI options to Elasticsearch via CLI arguments, and broke this by mistake. This is probably an uncommon pattern, versus environment variables or a config file. Nevertheless, it is supposed to be possible and is mentioned in the documentation. Fix the problem by suppling the missing positional params when calling Elasticsearch, and add a test case so that we don't break it again.
pugnascotia
added a commit
that referenced
this pull request
Jul 14, 2022
As part of #50277, we removed the `TAKE_FILE_OWNERSHIP` option from the Docker entrypoint script and the associated chroot calls, and instead just defaulted to running the image as `elasticsearch` instead of `root`. However, we didn't check that it was still possible to pass CLI options to Elasticsearch via CLI arguments, and broke this by mistake. This is probably an uncommon pattern, versus environment variables or a config file. Nevertheless, it is supposed to be possible and is mentioned in the documentation. Fix the problem by suppling the missing positional params when calling Elasticsearch, and add a test case so that we don't break it again.
pugnascotia
added a commit
to pugnascotia/elasticsearch
that referenced
this pull request
Jul 14, 2022
As part of elastic#50277, we removed the `TAKE_FILE_OWNERSHIP` option from the Docker entrypoint script and the associated chroot calls, and instead just defaulted to running the image as `elasticsearch` instead of `root`. However, we didn't check that it was still possible to pass CLI options to Elasticsearch via CLI arguments, and broke this by mistake. This is probably an uncommon pattern, versus environment variables or a config file. Nevertheless, it is supposed to be possible and is mentioned in the documentation. Fix the problem by suppling the missing positional params when calling Elasticsearch, and add a test case so that we don't break it again.
pugnascotia
added a commit
that referenced
this pull request
Jul 18, 2022
Backport of #88502. As part of #50277, we removed the `TAKE_FILE_OWNERSHIP` option from the Docker entrypoint script and the associated chroot calls, and instead just defaulted to running the image as `elasticsearch` instead of `root`. However, we didn't check that it was still possible to pass CLI options to Elasticsearch via CLI arguments, and broke this by mistake. This is probably an uncommon pattern, versus environment variables or a config file. Nevertheless, it is supposed to be possible and is mentioned in the documentation. Fix the problem by suppling the missing positional params when calling Elasticsearch, and add a test case so that we don't break it again.
pugnascotia
added a commit
to pugnascotia/elasticsearch
that referenced
this pull request
Jul 18, 2022
As part of elastic#50277, we removed the `TAKE_FILE_OWNERSHIP` option from the Docker entrypoint script and the associated chroot calls, and instead just defaulted to running the image as `elasticsearch` instead of `root`. However, we didn't check that it was still possible to pass CLI options to Elasticsearch via CLI arguments, and broke this by mistake. This is probably an uncommon pattern, versus environment variables or a config file. Nevertheless, it is supposed to be possible and is mentioned in the documentation. Fix the problem by suppling the missing positional params when calling Elasticsearch, and add a test case so that we don't break it again.
pugnascotia
added a commit
that referenced
this pull request
Jul 19, 2022
As part of #50277, we removed the `TAKE_FILE_OWNERSHIP` option from the Docker entrypoint script and the associated chroot calls, and instead just defaulted to running the image as `elasticsearch` instead of `root`. However, we didn't check that it was still possible to pass CLI options to Elasticsearch via CLI arguments, and broke this by mistake. This is probably an uncommon pattern, versus environment variables or a config file. Nevertheless, it is supposed to be possible and is mentioned in the documentation. Fix the problem by suppling the missing positional params when calling Elasticsearch, and add a test case so that we don't break it again.
pugnascotia
added a commit
that referenced
this pull request
Jul 19, 2022
As part of #50277, we removed the `TAKE_FILE_OWNERSHIP` option from the Docker entrypoint script and the associated chroot calls, and instead just defaulted to running the image as `elasticsearch` instead of `root`. However, we didn't check that it was still possible to pass CLI options to Elasticsearch via CLI arguments, and broke this by mistake. This is probably an uncommon pattern, versus environment variables or a config file. Nevertheless, it is supposed to be possible and is mentioned in the documentation. Fix the problem by suppling the missing positional params when calling Elasticsearch, and add a test case so that we don't break it again.
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.
Closes #49926. Closes #46166.
Also improve dependency tracking in the build.