Add make command for running the app in an HA topology (#16702)
* Add make command for running the app in an HA topology * Tidy up conf files, remove unnecessary commands and add restart-haserver command * Use the right flag for checking enterprise folder presence before ha setup
Этот коммит содержится в:
16
Makefile
16
Makefile
@@ -1,4 +1,4 @@
|
||||
.PHONY: build package run stop run-client run-server stop-client stop-server restart restart-server restart-client start-docker clean-dist clean nuke check-style check-client-style check-server-style check-unit-tests test dist prepare-enteprise run-client-tests setup-run-client-tests cleanup-run-client-tests test-client build-linux build-osx build-windows internal-test-web-client vet run-server-for-web-client-tests diff-config prepackaged-plugins prepackaged-binaries test-server test-server-ee test-server-quick test-server-race start-docker-check
|
||||
.PHONY: build package run stop run-client run-server run-haserver stop-client stop-server restart restart-server restart-client restart-haserver start-docker clean-dist clean nuke check-style check-client-style check-server-style check-unit-tests test dist prepare-enteprise run-client-tests setup-run-client-tests cleanup-run-client-tests test-client build-linux build-osx build-windows internal-test-web-client vet run-server-for-web-client-tests diff-config prepackaged-plugins prepackaged-binaries test-server test-server-ee test-server-quick test-server-race start-docker-check
|
||||
|
||||
ROOT := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
|
||||
|
||||
@@ -156,6 +156,13 @@ ifneq (,$(findstring openldap,$(ENABLED_DOCKER_SERVICES)))
|
||||
endif
|
||||
endif
|
||||
|
||||
run-haserver: run-client
|
||||
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||
@echo Starting mattermost in an HA topology
|
||||
|
||||
docker-compose -f docker-compose.yaml up haproxy
|
||||
endif
|
||||
|
||||
stop-docker: ## Stops the docker containers for local development.
|
||||
ifeq ($(MM_NO_DOCKER),true)
|
||||
@echo No Docker Enabled: skipping docker stop
|
||||
@@ -473,6 +480,13 @@ restart: restart-server restart-client ## Restarts the server and webapp.
|
||||
|
||||
restart-server: | stop-server run-server ## Restarts the mattermost server to pick up development change.
|
||||
|
||||
restart-haserver:
|
||||
@echo Restarting mattermost in an HA topology
|
||||
|
||||
docker-compose restart follower
|
||||
docker-compose restart leader
|
||||
docker-compose restart haproxy
|
||||
|
||||
restart-client: | stop-client run-client ## Restarts the webapp.
|
||||
|
||||
run-job-server: ## Runs the background job server.
|
||||
|
||||
Ссылка в новой задаче
Block a user