Skip to content

Commit

Permalink
Update elasticsearch build dependency to 2.3.2 (#1084)
Browse files Browse the repository at this point in the history
This should make tests more stable
  • Loading branch information
ruflin committed Apr 28, 2016
1 parent 236604b commit 2e0931d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file based on the
- Fix php notice on `\Elastica\Index::getAliases()` if index has no aliases #1078

### Added
- Update elasticsearch build dependency to elasticsearch 2.3.2

### Improvements
- `Elastica\Type->deleteByQuery($query, $options)` $query param can be a query `array` again https://github.com/ruflin/Elastica/issues/1072
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 2.x releases. It was tested with version 2.2.1
This release is compatible with all elasticsearch 2.x releases. It was tested with version 2.3.2


Contributing
Expand All @@ -29,5 +29,5 @@ Dependencies
------------
| Project | Version | Required |
|---------|---------|----------|
|[Elasticsearch](https://github.com/elasticsearch/elasticsearch/tree/v2.2.1)|2.2.1|yes|
|[Elasticsearch](https://github.com/elasticsearch/elasticsearch/tree/v2.3.2)|2.3.2|yes|
|[Elasticsearch image plugin](https://github.com/Jmoati/elasticsearch-image/releases/tag/1.7.1)|1.7.1|no|
2 changes: 1 addition & 1 deletion docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ readParams() {
# green or yellow.
waitForElasticsearch() {
echo -n "Waiting on elasticsearch(${ES_HOST}:${ES_PORT}) to start."
for ((i=1;i<=30;i++))
for ((i=1;i<=60;i++))
do
health=$(curl --silent "http://${ES_HOST}:${ES_PORT}/_cat/health" | awk '{print $4}')
if [[ "$health" == "green" ]] || [[ "$health" == "yellow" ]]
Expand Down
2 changes: 1 addition & 1 deletion env/elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM elasticsearch:2.2.1
FROM elasticsearch:2.3.2
MAINTAINER Nicolas Ruflin <[email protected]>

# Dependencies
Expand Down

0 comments on commit 2e0931d

Please sign in to comment.