From d2c8571741d30ae6295b7e5dad086400c6d748d0 Mon Sep 17 00:00:00 2001 From: Dimitrios Liappis Date: Fri, 31 May 2019 14:40:50 +0300 Subject: [PATCH 1/2] Clarify heap setting in Docker docs Add note in the Docker docs that even when container memory is limited, we still require specifying -Xms/-Xmx using one of the supported methods. --- docs/reference/setup/install/docker.asciidoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/reference/setup/install/docker.asciidoc b/docs/reference/setup/install/docker.asciidoc index 9037a292168de..68be332d9702a 100644 --- a/docs/reference/setup/install/docker.asciidoc +++ b/docs/reference/setup/install/docker.asciidoc @@ -372,6 +372,10 @@ published ports with `--publish-all`, unless you are pinning one container per h . Use the `ES_JAVA_OPTS` environment variable to set heap size. For example, to use 16GB, use `-e ES_JAVA_OPTS="-Xms16g -Xmx16g"` with `docker run`. ++ +-- +NOTE: You still need to configure the heap size even if you are https://docs.docker.com/config/containers/resource_constraints/#limit-a-containers-access-to-memory[limiting memory access] to the container. +-- . Pin your deployments to a specific version of the {es} Docker image, for example +docker.elastic.co/elasticsearch/elasticsearch:{version}+. From 274917c804916c69a15fb9fcffffd7fb77aa5631 Mon Sep 17 00:00:00 2001 From: Dimitrios Liappis Date: Fri, 31 May 2019 17:20:57 +0300 Subject: [PATCH 2/2] Addressing PR comment --- docs/reference/setup/install/docker.asciidoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/reference/setup/install/docker.asciidoc b/docs/reference/setup/install/docker.asciidoc index 68be332d9702a..e8dd1ee95957a 100644 --- a/docs/reference/setup/install/docker.asciidoc +++ b/docs/reference/setup/install/docker.asciidoc @@ -374,7 +374,9 @@ published ports with `--publish-all`, unless you are pinning one container per h use 16GB, use `-e ES_JAVA_OPTS="-Xms16g -Xmx16g"` with `docker run`. + -- -NOTE: You still need to configure the heap size even if you are https://docs.docker.com/config/containers/resource_constraints/#limit-a-containers-access-to-memory[limiting memory access] to the container. +NOTE: You still need to <> even if you are +https://docs.docker.com/config/containers/resource_constraints/#limit-a-containers-access-to-memory[limiting +memory access] to the container. -- . Pin your deployments to a specific version of the {es} Docker image, for