update docker-compose to 3.4, update ES version & bug on new ES version on Percentiles aggregations (#1531)

I've updated the:

- docker-compose to a newer version (3.4)
- updated to ElasticSearch 6.4.x (available on [HERE](https://www.docker.elastic.co/))
- Updated Percentiles Aggregation Tests as the T-Digest algorithm has been updated and so all the tests failed. Have a look at [the PR on ES](elastic/elasticsearch#28305)

Author: p365labs

CHANGELOG.md

@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file based on the
   * `\Elastica\ResultSet::next` returns `void` instead of `\Elastica\Result|false`
   * `\Elastica\Bulk\ResponseSet::current` returns `\Elastica\Bulk\Response` instead of `\Elastica\Bulk\Response|false`
   * `\Elastica\Multi\ResultSet::current` returns `\Elastica\ResultSet` instead of `\Elastica\ResultSet|false`
+* Aggreation\Percentiles updated to a newer version of the Algorithm (T-Digest 3.2) and Percentiles results changed a bit Have a [look at here](https://github.com/elastic/elasticsearch/pull/28305), so updated tests in order not to fail. [#1531]([#1352](https://github.com/ruflin/Elastica/pull/1531))
 
 ### Bugfixes
 

README.md

@@ -17,7 +17,7 @@ All library issues should go to the [issue tracker from github](https://github.c
 
 Compatibility
 -------------
-This release is compatible with all Elasticsearch 6.x releases. It was tested with version 6.2.4.
+This release is compatible with all Elasticsearch 6.x releases. It was tested with version 6.4.2.
 
 
 Contributing

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2.0'
+version: '3.4'
 
 services:
   elastica:
@@ -10,25 +10,20 @@ services:
     networks:
       - esnet
 
-  #SETUP ELASTICSEARCH 6.0-beta1
   elasticsearch6_1:
     build: ./env/elasticsearch/
     container_name: elasticsearch
     privileged: true
     environment:
       - bootstrap.memory_lock=true
-      - network.host=172.18.0.15
+      - network.host=10.10.10.15
       - xpack.security.enabled=false
       - xpack.monitoring.enabled=false
-      - "ES_JAVA_OPTS=-Xms256m -Xmx256m"
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ulimits:
       memlock:
         soft: -1
         hard: -1
-      nofile:
-        soft: 65536
-        hard: 65536
-    mem_limit: 1g
     cap_add:
       - ALL
       - IPC_LOCK
@@ -38,38 +33,34 @@ services:
       - 9200:9200
     networks:
       esnet:
-        ipv4_address: 172.18.0.15
+        ipv4_address: 10.10.10.15
   elasticsearch6_2:
     build: ./env/elasticsearch/
     privileged: true
     environment:
       - bootstrap.memory_lock=true
-      - network.host=172.18.0.16
+      - network.host=10.10.10.16
       - xpack.security.enabled=false
       - xpack.monitoring.enabled=false
-      - "ES_JAVA_OPTS=-Xms256m -Xmx256m"
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ulimits:
       memlock:
         soft: -1
         hard: -1
-      nofile:
-        soft: 65536
-        hard: 65536
-    mem_limit: 1g
     cap_add:
       - ALL
       - IPC_LOCK
     volumes:
       - esdata1:/usr/share/elasticsearch/data
     networks:
       esnet:
-        ipv4_address: 172.18.0.16
+        ipv4_address: 10.10.10.16
 
   nginx:
     build: ./env/nginx/
     networks:
       esnet:
-        ipv4_address: 172.18.0.5
+        ipv4_address: 10.10.10.5
 
 
 volumes:
@@ -82,6 +73,6 @@ networks:
   esnet:
     driver: bridge
     ipam:
-     config:
-       - subnet: 172.18.0.0/16
-         gateway: 172.18.0.1
+      driver: default
+      config:
+      - subnet: 10.10.10.0/24

env/elasticsearch/Dockerfile

@@ -1,7 +1,8 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.2.4
+#https://www.docker.elastic.co/
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.4.2
 MAINTAINER Nicolas Ruflin <[email protected]>
 
-RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment
+RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch ingest-attachment
 
 
 # Copy config files

test/Elastica/Aggregation/PercentilesTest.php

@@ -86,6 +86,7 @@ public function testSetScript()
      */
     public function testActualWork()
     {
+
         // prepare
         $index = $this->_createIndex();
         $type = $index->getType('offer');
@@ -113,13 +114,12 @@ public function testActualWork()
         $resultSet = $type->search($query);
         $aggrResult = $resultSet->getAggregation('price_percentile');
 
-        // hope it's ok to hardcode results...
-        $this->assertEquals(109.0, $aggrResult['values']['1.0']);
-        $this->assertEquals(145.0, $aggrResult['values']['5.0']);
-        $this->assertEquals(325.0, $aggrResult['values']['25.0']);
+        $this->assertEquals(100.0, $aggrResult['values']['1.0']);
+        $this->assertEquals(100.0, $aggrResult['values']['5.0']);
+        $this->assertEquals(300.0, $aggrResult['values']['25.0']);
         $this->assertEquals(550.0, $aggrResult['values']['50.0']);
-        $this->assertEquals(775.0, $aggrResult['values']['75.0']);
-        $this->assertEquals(955.0, $aggrResult['values']['95.0']);
-        $this->assertEquals(991.0, $aggrResult['values']['99.0']);
+        $this->assertEquals(800.0, $aggrResult['values']['75.0']);
+        $this->assertEquals(1000.0, $aggrResult['values']['95.0']);
+        $this->assertEquals(1000.0, $aggrResult['values']['99.0']);
     }
 }