From 256eb54b5aa492ddbd79c086f9c14fc777aec13a Mon Sep 17 00:00:00 2001
From: SafwenSoker <safwensoker1@gmail.com>
Date: Thu, 3 Mar 2022 18:07:27 +0100
Subject: [PATCH] Dockerize elasticsearch

---
 docker/docker-compose-v7.1.1.yml | 36 --------------------------------
 docker/docker-compose.yml        |  8 +++++--
 2 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 docker/docker-compose-v7.1.1.yml

diff --git a/docker/docker-compose-v7.1.1.yml b/docker/docker-compose-v7.1.1.yml
deleted file mode 100644
index 77e9571..0000000
--- a/docker/docker-compose-v7.1.1.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-version: '2.2'
-
-services:
-
-  elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.1.1
-    container_name: elasticsearch
-    environment:
-      - node.name=elasticsearch
-      - discovery.seed_hosts=elasticsearch
-      - cluster.initial_master_nodes=elasticsearch
-      - cluster.name=docker-cluster
-      - bootstrap.memory_lock=true
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-    volumes:
-      - esdata1:/usr/share/elasticsearch/data
-    ports:
-      - 9200:9200
-
-  kibana:
-    image: docker.elastic.co/kibana/kibana:7.1.1
-    container_name: kibana
-    environment:
-      ELASTICSEARCH_URL: "http://elasticsearch:9200"
-    ports:
-      - 5601:5601
-    depends_on:
-      - elasticsearch
-
-volumes:
-  esdata1:
-    driver: local
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 961c8c9..77e9571 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -3,9 +3,13 @@ version: '2.2'
 services:
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.5.4
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.1.1
     container_name: elasticsearch
     environment:
+      - node.name=elasticsearch
+      - discovery.seed_hosts=elasticsearch
+      - cluster.initial_master_nodes=elasticsearch
+      - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ulimits:
@@ -18,7 +22,7 @@ services:
       - 9200:9200
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:6.5.4
+    image: docker.elastic.co/kibana/kibana:7.1.1
     container_name: kibana
     environment:
       ELASTICSEARCH_URL: "http://elasticsearch:9200"