From 727fe94f3c64b4eb364140ca9039b16d282cb2d8 Mon Sep 17 00:00:00 2001
From: Oliver Eilhard <oliver@eilhard.net>
Date: Fri, 15 Sep 2017 19:01:09 +0200
Subject: [PATCH] Update to 5.6.0

---
 .travis.yml               |  4 ++--
 docker-compose.yml        | 23 +++++++++++++++++++++++
 etc/ingest-geoip/.gitkeep |  0
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 docker-compose.yml
 create mode 100644 etc/ingest-geoip/.gitkeep

diff --git a/.travis.yml b/.travis.yml
index e1466aa79..582ec15e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ sudo: required
 language: go
 script: go test -race -v . ./config
 go:
-  - 1.7
   - 1.8
+  - 1.9
   - tip
 matrix:
   allow_failures:
@@ -12,5 +12,5 @@ services:
   - docker
 before_script:
   - sudo sysctl -w vm.max_map_count=262144
-  - docker run --rm --privileged=true -p 9200:9200 -p 9300:9300 -e "bootstrap.memory_lock=true" -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" docker.elastic.co/elasticsearch/elasticsearch:5.5.0 elasticsearch -Expack.security.enabled=false -Escript.inline=true -Escript.stored=true -Escript.file=true -Enetwork.host=_local_,_site_ -Enetwork.publish_host=_local_ >& /dev/null &
+  - docker run --rm --privileged=true -p 9200:9200 -p 9300:9300 -e "bootstrap.memory_lock=true" -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" docker.elastic.co/elasticsearch/elasticsearch:5.6.0 elasticsearch -Expack.security.enabled=false -Escript.inline=true -Escript.stored=true -Escript.file=true -Enetwork.host=_local_,_site_ -Enetwork.publish_host=_local_ >& /dev/null &
   - sleep 30
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..046096db2
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,23 @@
+version: '3'
+
+services:
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:5.6.0
+    # container_name: elasticsearch
+    hostname: elasticsearch
+    environment:
+      - bootstrap.memory_lock=true
+      - xpack.security.enabled=false
+      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
+    ulimits:
+      nproc: 65536
+      nofile:
+        soft: 65536
+        hard: 65536
+      memlock:
+        soft: -1
+        hard: -1
+    volumes:
+      - ./etc:/usr/share/elasticsearch/config
+    ports:
+      - 9200:9200
diff --git a/etc/ingest-geoip/.gitkeep b/etc/ingest-geoip/.gitkeep
new file mode 100644
index 000000000..e69de29bb