diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-03-18 10:47:08 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-03-18 10:47:08 -0400 |
| commit | 5b824cb8552f5dd81d7c1d7800b808d4defc17ad (patch) | |
| tree | c86c65999261591726826678d87073dd0d4b0a8a /Makefile | |
| parent | 53d7718e57d4225eb5c020324d32cbe5b5eca7ad (diff) | |
| parent | 77ffdc699032f9a669caa7a640cfe734da49cc5a (diff) | |
| download | chat-5b824cb8552f5dd81d7c1d7800b808d4defc17ad.tar.gz chat-5b824cb8552f5dd81d7c1d7800b808d4defc17ad.tar.bz2 chat-5b824cb8552f5dd81d7c1d7800b808d4defc17ad.zip | |
Merge pull request #2470 from mattermost/plt-2380
PLT-2380 Improvements to webpack build system + watch mode
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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: |