From 9a239e982a0068c246af58b86a18b36dbd77a222 Mon Sep 17 00:00:00 2001
From: Jose Duran <jose.daniel.duran.toro@gmail.com>
Date: Fri, 2 Aug 2019 10:56:30 -0500
Subject: [PATCH 1/2] add docker-compose file to set up ES5 for testing

---
 tests/ES5/config/elasticsearch.yml |  3 +++
 tests/ES5/docker-compose.yml       | 35 ++++++++++++++++++++++++++++++
 tests/ES5/dockerfile               |  3 +++
 3 files changed, 41 insertions(+)
 create mode 100644 tests/ES5/config/elasticsearch.yml
 create mode 100644 tests/ES5/docker-compose.yml
 create mode 100644 tests/ES5/dockerfile

diff --git a/tests/ES5/config/elasticsearch.yml b/tests/ES5/config/elasticsearch.yml
new file mode 100644
index 0000000..ee8de7e
--- /dev/null
+++ b/tests/ES5/config/elasticsearch.yml
@@ -0,0 +1,3 @@
+xpack.security.enabled: false
+cluster.name: "docker-cluster"
+network.host: 0.0.0.0
diff --git a/tests/ES5/docker-compose.yml b/tests/ES5/docker-compose.yml
new file mode 100644
index 0000000..d9605eb
--- /dev/null
+++ b/tests/ES5/docker-compose.yml
@@ -0,0 +1,35 @@
+version: "2"
+services:
+  elasticsearch1:
+    build: .
+    container_name: elasticsearch1
+    environment:
+      - cluster.name=docker-cluster
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+    mem_limit: 1g
+    ports:
+      - 9200:9200
+    networks:
+      - esnet
+  elasticsearch2:
+    build: .
+    environment:
+      - cluster.name=docker-cluster
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - "discovery.zen.ping.unicast.hosts=elasticsearch1"
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+    mem_limit: 1g
+    networks:
+      - esnet
+
+networks:
+  esnet: {}
diff --git a/tests/ES5/dockerfile b/tests/ES5/dockerfile
new file mode 100644
index 0000000..d5106ff
--- /dev/null
+++ b/tests/ES5/dockerfile
@@ -0,0 +1,3 @@
+FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.0
+
+COPY config /usr/share/elasticsearch/config/
\ No newline at end of file

From 5f430a1fc3aa45ac13b3d15c7f8769ff40895c30 Mon Sep 17 00:00:00 2001
From: Jose Duran <jose.daniel.duran.toro@gmail.com>
Date: Fri, 2 Aug 2019 11:42:44 -0500
Subject: [PATCH 2/2] add makefile entries to use docker-compose ES5 containers

---
 Makefile | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/Makefile b/Makefile
index d6b4d7e..9693099 100644
--- a/Makefile
+++ b/Makefile
@@ -82,3 +82,25 @@ module-touch:
 
 upload:
 	stack upload --no-signature .
+
+# Create ES5 instance
+
+## Run test environment
+compose-ES5:
+	@LOCAL_USER_ID=${LOCAL_USER_ID} docker-compose -f tests/ES5/docker-compose.yml --project-directory tests/ES5/ up
+
+## Run test environment in detach mode
+compose-ES5-detach-up:
+	@LOCAL_USER_ID=${LOCAL_USER_ID} docker-compose -f tests/ES5/docker-compose.yml --project-directory tests/ES5/ up -d
+
+## Close test environment if run on detach mode
+compose-ES5-detach-down:
+	@LOCAL_USER_ID=${LOCAL_USER_ID} docker-compose -f tests/ES5/docker-compose.yml --project-directory tests/ES5/ down
+
+## build the docker compose images
+compose-build:
+	@LOCAL_USER_ID=${LOCAL_USER_ID} docker-compose -f tests/ES5/docker-compose.yml --project-directory tests/ES5/ build
+
+## Spawn bash shell in ES5 test container
+ES5-shell:
+	@LOCAL_USER_ID=${LOCAL_USER_ID} docker-compose -f tests/ES5/docker-compose.yml --project-directory tests/ES5/ exec elasticsearch1 bash