From 09af5c6e9f44484979d01699f8d092450157fd7f Mon Sep 17 00:00:00 2001 From: Lord-Y Date: Mon, 9 Oct 2017 12:01:03 +0200 Subject: [PATCH 1/3] upgrading to fabric8 5.5.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 91ca5c8..b54b8a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM elasticsearch:2.4.0 RUN bin/plugin install lmenezes/elasticsearch-kopf/v2.1.2 -RUN bin/plugin install io.fabric8/elasticsearch-cloud-kubernetes/2.4.0_01 +RUN bin/plugin install io.fabric8/elasticsearch-cloud-kubernetes/5.5.2 ENV BOOTSTRAP_MLOCKALL=false NODE_DATA=true NODE_MASTER=true JAVA_OPTS=-Djava.net.preferIPv4Stack=true From a191557ebccb1d8c9b26a387e864be543f80961a Mon Sep 17 00:00:00 2001 From: Lord-Y Date: Mon, 9 Oct 2017 12:06:20 +0200 Subject: [PATCH 2/3] upgrading to elasticsearch 5.5.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b54b8a8..2c2190e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM elasticsearch:2.4.0 +FROM elasticsearch:5.5.2 RUN bin/plugin install lmenezes/elasticsearch-kopf/v2.1.2 RUN bin/plugin install io.fabric8/elasticsearch-cloud-kubernetes/5.5.2 From e059b9650c6b9249311555ab5ee39fd4c0c52cbb Mon Sep 17 00:00:00 2001 From: Lord-Y Date: Mon, 9 Oct 2017 17:41:02 +0200 Subject: [PATCH 3/3] Few changes in Dockerfile - Disable swap for the pod - Removing kopf - set BOOTSTRAP_MLOCKALL to true --- Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2c2190e..8f4bf04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,18 @@ FROM elasticsearch:5.5.2 -RUN bin/plugin install lmenezes/elasticsearch-kopf/v2.1.2 -RUN bin/plugin install io.fabric8/elasticsearch-cloud-kubernetes/5.5.2 +RUN bin/elasticsearch-plugin install io.fabric8:elasticsearch-cloud-kubernetes:5.5.2 -ENV BOOTSTRAP_MLOCKALL=false NODE_DATA=true NODE_MASTER=true JAVA_OPTS=-Djava.net.preferIPv4Stack=true +ENV BOOTSTRAP_MLOCKALL=true NODE_DATA=true NODE_MASTER=true JAVA_OPTS=-Djava.net.preferIPv4Stack=true + +# Disable swap +RUN echo 'vm.swappiness=1' | tee -a /etc/sysctl.conf # pre-stop-hook.sh and dependencies RUN apt-get update && apt-get install -y \ jq \ curl \ && rm -rf /var/lib/apt/lists/* + COPY pre-stop-hook.sh /pre-stop-hook.sh ADD elasticsearch.yml /usr/share/elasticsearch/config/elasticsearch.yml