Do not expose ES ports locally during tests

Running the test targets (single-node-test, cluster-unicast-test) can
sometimes lead to CI failures:
https://devops-ci.elastic.co/view/Docker/job/elastic+elasticsearch-docker+5.0/21/console. This
can happen when both targets are run simultaneously due to a conflict on
the locally exposed port :9200.

Remove local port references for ES in docker-compose.yml. This change
doesn't affect the tests as the test container accesses ES through the
docker network driver.

Retain backwards compatibility for run-es(single|cluster) targets, by
overriding the localhost port definitions with
docker-compose.hostports.yml. This strategy is described in:
docker/compose#2260 (comment)

Makefile

@@ -38,10 +38,10 @@ clean:
 	rm -f tests/*.pyc
 
 run-es-single: pull-latest-baseimage
-	ES_NODE_COUNT=1 docker-compose up --build elasticsearch1
+	ES_NODE_COUNT=1 docker-compose -f docker-compose.yml -f docker-compose.hostports.yml up --build elasticsearch1
 
 run-es-cluster: pull-latest-baseimage
-	ES_NODE_COUNT=2 docker-compose up --build elasticsearch1 elasticsearch2
+	ES_NODE_COUNT=2 docker-compose -f docker-compose.yml -f docker-compose.hostports.yml up --build elasticsearch1 elasticsearch2
 
 single-node-test: export ES_NODE_COUNT=1
 single-node-test: pull-latest-baseimage clean

docker-compose.hostports.yml

@@ -0,0 +1,7 @@
+# Override docker-compose ports to expose 9200 on localhost for run-* targets
+---
+version: '2'
+services:
+  elasticsearch1:
+    ports:
+      - 9200:9200

docker-compose.yml

@@ -17,9 +17,6 @@ services:
       - discovery.zen.minimum_master_nodes=${ES_NODE_COUNT}
     image: "elasticsearch:${IMAGETAG}"
     mem_limit: 4g
-    ports:
-      - 9200:9200
-      - 9300
     ulimits:
       memlock:
         soft: -1
@@ -45,9 +42,6 @@ services:
     links:
       - elasticsearch1
     mem_limit: 4g
-    ports:
-      - 9200
-      - 9300
     ulimits:
       memlock:
         soft: -1