Skip to content

Commit

Permalink
Update Elasticsearch: 5.6.14 -> 6.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
danmichaelo authored and addshore committed Apr 22, 2020
1 parent 16cd243 commit 1677ce4
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ env:
- IMAGE_PATH=wdqs-proxy/latest/
- IMAGE_PATH=quickstatements/latest/
- IMAGE_PATH=elasticsearch/5.6.14-extra/
- IMAGE_PATH=elasticsearch/6.5.4-extra/

script:
- source ./.travis/docker-push-setup.sh
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ services:
- WDQS_HOST=wdqs.svc
- WDQS_PORT=9999
elasticsearch:
image: wikibase/elasticsearch:5.6.14-extra
image: wikibase/elasticsearch:6.5.4-extra
restart: unless-stopped
networks:
default:
Expand Down
10 changes: 10 additions & 0 deletions elasticsearch/6.5.4-extra/.travis/build-deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash
#Oneline for full directory name see: https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
set -e
docker build "$DIR/../" -t wikibase/elasticsearch:6.5.4-extra -t wikibase/elasticsearch:latest

if [ "$SHOULD_DOCKER_PUSH" = true ]; then
docker push wikibase/elasticsearch:6.5.4-extra
docker push wikibase/elasticsearch:latest
fi
3 changes: 3 additions & 0 deletions elasticsearch/6.5.4-extra/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM elasticsearch:6.5.4
RUN ./bin/elasticsearch-plugin install org.wikimedia.search:extra:6.5.4
RUN ./bin/elasticsearch-plugin install org.wikimedia.search.highlighter:experimental-highlighter-elasticsearch-plugin:6.5.4
4 changes: 2 additions & 2 deletions elasticsearch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

Wikibase needs the extra plugin for elasticsearch from here:

https://mvnrepository.com/artifact/org.wikimedia.search/extra/5.6.14
https://mvnrepository.com/artifact/org.wikimedia.search/extra/6.5.4

Image name | Parent image
--------------------------------------- | ------------------------
`wikibase/elasticsearch` : `5.6.14-extra`, `latest` | [elasticsearch:5.6.14](https://hub.docker.com/_/elasticsearch/)
`wikibase/elasticsearch` : `6.5.4-extra`, `latest` | [elasticsearch:6.5.4](https://hub.docker.com/_/elasticsearch/)

0 comments on commit 1677ce4

Please sign in to comment.