summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1d78118e4..eb0bdc06f 100644
--- a/Makefile
+++ b/Makefile
@@ -218,16 +218,16 @@ nuke: | clean clean-docker
touch $@
-run: | start-docker run-client run-server
+run: | start-docker run-server run-client
run-server: .prepare-go
@echo Starting go web server
+ mkdir -p webapp/dist/files
$(GO) run $(GOFLAGS) mattermost.go -config=config.json &
run-client:
@echo Starting client
- mkdir -p webapp/dist/files
cd webapp && make run
@if [ "$(BUILD_ENTERPRISE)" = "true" ] && [ -d "$(ENTERPRISE_DIR)" ]; then \
@@ -240,7 +240,7 @@ run-client:
sed -i'.bak' 's|_BUILD_ENTERPRISE_READY_|false|g' ./model/version.go; \
fi
-stop: stop-server
+stop: stop-server stop-client
@if [ $(shell docker ps -a | grep -ci ${DOCKER_CONTAINER_NAME}) -eq 1 ]; then \
echo removing dev docker container; \
docker stop ${DOCKER_CONTAINER_NAME} > /dev/null; \
@@ -264,6 +264,9 @@ stop-server:
kill $$PID; \
done
+stop-client:
+ cd webapp && make stop
+
restart-server: stop-server run-server
setup-mac: