diff options
author | George Goldberg <george@gberg.me> | 2017-07-07 15:36:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-07 15:36:17 +0100 |
commit | db2f6cf0766543b6d9e9fb4ecd10947ce60b46b9 (patch) | |
tree | badd2021308c320d893824bc1ac1b28ba92d384d /Makefile | |
parent | 0495a519499d6cefa289982a94d8f42de541c1f0 (diff) | |
download | chat-db2f6cf0766543b6d9e9fb4ecd10947ce60b46b9.tar.gz chat-db2f6cf0766543b6d9e9fb4ecd10947ce60b46b9.tar.bz2 chat-db2f6cf0766543b6d9e9fb4ecd10947ce60b46b9.zip |
PLT-6976: Elasticsearch capitalisation and tests. (#6839)
* Fixes Elasticsearch to have consistent capitalisation everywhere
across the code and UI (except the config file unfortunately).
* Adds basic unit tests for Elastichsearch.
* Adds a Elasticsearch docker image to the Makefile to enable testing
the Elasticsearch feature.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 19 |
1 files changed, 19 insertions, 0 deletions
@@ -123,6 +123,14 @@ ifeq ($(BUILD_ENTERPRISE_READY),true) docker start mattermost-openldap > /dev/null; \ sleep 10; \ fi + + @if [ $(shell docker ps -a | grep -ci mattermost-elasticsearch) -eq 0 ]; then \ + echo starting mattermost-elasticsearch; \ + docker run --name mattermost-elasticsearch -p 9200:9200 -e "http.host=0.0.0.0" -e "transport.host=127.0.0.1" -e "ES_JAVA_OPTS=-Xms250m -Xmx250m" -d grundleborg/elasticsearch:latest > /dev/null; \ + elif [ $(shell docker ps | grep -ci mattermost-elasticsearch) -eq 0 ]; then \ + echo restarting mattermost-elasticsearch; \ + docker start mattermost-elasticsearch> /dev/null; \ + fi endif stop-docker: @@ -148,6 +156,11 @@ stop-docker: docker stop mattermost-inbucket > /dev/null; \ fi + @if [ $(shell docker ps -a | grep -ci mattermost-elasticsearch) -eq 1 ]; then \ + echo stopping mattermost-elasticsearch; \ + docker stop mattermost-elasticsearch > /dev/null; \ + fi + clean-docker: @echo Removing docker containers @@ -175,6 +188,12 @@ clean-docker: docker rm -v mattermost-inbucket > /dev/null; \ fi + @if [ $(shell docker ps -a | grep -ci mattermost-elasticsearch) -eq 1 ]; then \ + echo removing mattermost-elasticsearch; \ + docker stop mattermost-elasticsearch > /dev/null; \ + docker rm -v mattermost-elasticsearch > /dev/null; \ + fi + check-client-style: @echo Checking client style |