From 47581c9a8289d79609e94abdd43e4417e960f6bc Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Fri, 25 Mar 2022 11:35:59 +0100
Subject: [PATCH] Added mx JVM heap to elasticsearch dev and ci.

---
 .gitlab-ci.yml                                       | 9 ++++++---
 docs/oasis.md                                        | 1 +
 ops/docker-compose/infrastructure/docker-compose.yml | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da47b769c..8d3b947d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,9 +86,10 @@ python tests:
       alias: rabbitmq
     - name: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
       alias: elastic
-      # fix issue with running elastic in gitlab ci runner:
-      # https://gitlab.com/gitlab-org/gitlab-ce/issues/42214
-      command: [ "bin/elasticsearch", "-Ediscovery.type=single-node" ]
+      command:
+        - bash
+        - "-c"
+        - ES_JAVA_OPTS="-Xms512m -Xmx512m" docker-entrypoint.sh elasticsearch -Ediscovery.type=single-node -Expack.security.enabled=false
     - name: mongo:5.0.6
       alias: mongo
   variables:
@@ -102,6 +103,8 @@ python tests:
     NOMAD_KEYCLOAK_PASSWORD: ${CI_KEYCLOAK_ADMIN_PASSWORD}
     NOMAD_NORMALIZE_SPRINGER_DB_PATH: /nomad/fairdi/db/data/springer.msg
   script:
+    - sleep 5
+    - curl http://elastic:9200/_cat/health
     - cd /app
     - ls /builds
     - python -m pytest --cov=nomad -sv tests
diff --git a/docs/oasis.md b/docs/oasis.md
index 76ffbfb8f..084d102f0 100644
--- a/docs/oasis.md
+++ b/docs/oasis.md
@@ -103,6 +103,7 @@ services:
         image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
         container_name: nomad_oasis_elastic
         environment:
+            - ES_JAVA_OPTS=-Xms512m -Xmx512m
             - discovery.type=single-node
         volumes:
             - nomad_oasis_elastic:/usr/share/elasticsearch/data
diff --git a/ops/docker-compose/infrastructure/docker-compose.yml b/ops/docker-compose/infrastructure/docker-compose.yml
index 14b49d390..c97c6df38 100644
--- a/ops/docker-compose/infrastructure/docker-compose.yml
+++ b/ops/docker-compose/infrastructure/docker-compose.yml
@@ -48,11 +48,13 @@ services:
         image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
         container_name: nomad_elastic
         environment:
+            - ES_JAVA_OPTS=-Xms512m -Xmx512m
             - cluster.routing.allocation.disk.threshold_enabled=true
             - cluster.routing.allocation.disk.watermark.flood_stage=1gb
             - cluster.routing.allocation.disk.watermark.low=4gb
             - cluster.routing.allocation.disk.watermark.high=2gb
             - discovery.type=single-node
+            - xpack.security.enabled=false
         ports:
             - 9200:9200
         volumes:
-- 
GitLab