diff --git a/.ci/docker-compose.yml b/.ci/docker-compose.yml index ba8b0538e..f9d9df846 100644 --- a/.ci/docker-compose.yml +++ b/.ci/docker-compose.yml @@ -21,7 +21,7 @@ services: - elasticsearch-oss elasticsearch-oss: - image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-7.0.0-beta1} + image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-5.6.15} - elasticsearch volumes: - esvol:/tmp @@ -56,7 +56,7 @@ services: - elasticsearch-platinum elasticsearch-platinum: - image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-7.0.0-beta1} + image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:5.6.15} ports: - "9200:9200" networks: diff --git a/.ci/test-matrix.yml b/.ci/test-matrix.yml index a23cedf9e..d1d99a8ff 100644 --- a/.ci/test-matrix.yml +++ b/.ci/test-matrix.yml @@ -1,6 +1,6 @@ --- ELASTICSEARCH_VERSION: -- 7.0.0-beta1 +- 5.6.15 NODE_JS_VERSION: - 10 diff --git a/.travis.yml b/.travis.yml index 3eb76648b..67b5273ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ node_js: env: global: - - ELASTICSEARCH_VERSION=7.0.0-beta1 + - ELASTICSEARCH_VERSION=5.6.15 - QUIET=true before_install: diff --git a/scripts/es-docker-platinum.sh b/scripts/es-docker-platinum.sh index 8ab34962a..8b39c6e12 100755 --- a/scripts/es-docker-platinum.sh +++ b/scripts/es-docker-platinum.sh @@ -28,5 +28,4 @@ exec docker run \ -v "$repo$testnodekey:/usr/share/elasticsearch/config/certs/testnode.key" \ -v "$repo$cacrt:/usr/share/elasticsearch/config/certs/ca.crt" \ -p 9200:9200 \ - docker.elastic.co/elasticsearch/elasticsearch:7.0.0-beta1 - # docker.elastic.co/elasticsearch/elasticsearch:6.6.0 + docker.elastic.co/elasticsearch/elasticsearch:5.6.15 diff --git a/scripts/es-docker.sh b/scripts/es-docker.sh index d0e4f5adb..257474553 100755 --- a/scripts/es-docker.sh +++ b/scripts/es-docker.sh @@ -9,5 +9,4 @@ exec docker run \ -p 9200:9200 \ --network=elastic \ --name=elasticsearch \ - docker.elastic.co/elasticsearch/elasticsearch:7.0.0-beta1 - # docker.elastic.co/elasticsearch/elasticsearch:6.6.0 + docker.elastic.co/elasticsearch/elasticsearch:5.6.15