Skip to content

Commit

Permalink
Update to 5.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
olivere committed Sep 15, 2017
1 parent 78d326a commit 727fe94
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -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:
Expand All @@ -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
23 changes: 23 additions & 0 deletions 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
Empty file added etc/ingest-geoip/.gitkeep
Empty file.

0 comments on commit 727fe94

Please sign in to comment.