diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 06:08:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 06:08:26 +0300 |
| commit | 32d52eb6dd32c58016fa99e05078836cb0dcabde (patch) | |
| tree | 7f42649d0a1fb5ff9c3996d4cdcc9464d116169c /doc/development/elasticsearch.md | |
| parent | 66ce6a78f6203652c34bd0532b63c394d5394cc4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/elasticsearch.md')
| -rw-r--r-- | doc/development/elasticsearch.md | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/doc/development/elasticsearch.md b/doc/development/elasticsearch.md index bd8a4e1c6d7..e3ec69b6489 100644 --- a/doc/development/elasticsearch.md +++ b/doc/development/elasticsearch.md @@ -15,27 +15,15 @@ In June 2019, Mario de la Ossa hosted a [Deep Dive] on GitLab's [Elasticsearch i [Google Slides]: https://docs.google.com/presentation/d/1H-pCzI_LNrgrL5pJAIQgvLX8Ji0-jIKOg1QeJQzChug/edit [PDF]: https://gitlab.com/gitlab-org/create-stage/uploads/c5aa32b6b07476fa8b597004899ec538/Elasticsearch_Deep_Dive.pdf -## Initial installation on OS X +## Supported Versions -It is recommended to use the Docker image. After installing docker you can immediately spin up an instance with +See [Version Requirements](../integration/elasticsearch.md#version-requirements). -``` -docker run --name elastic56 -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:5.6.12 -``` - -and use `docker stop elastic56` and `docker start elastic56` to stop/start it. - -### Installing on the host +Developers making significant changes to Elasticsearch queries should test their features against all our supported versions. -We currently only support Elasticsearch [5.6 to 6.x](../integration/elasticsearch.md#version-requirements) - -Version 5.6 is available on homebrew and is the recommended version to use in order to test compatibility. - -``` -brew install elasticsearch@5.6 -``` +## Setting up development environment -There is no need to install any plugins +See the [Elasticsearch GDK setup instructions](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/howto/elasticsearch.md) ## Helpful rake tasks |