summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c6668fbd4..9c4e6ee1f 100644
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@ travis-init:
build-container:
@echo Building in container
- docker run -e TRAVIS_BUILD_NUMBER=$(TRAVIS_BUILD_NUMBER) --link mattermost-mysql:mysql --link mattermost-postgres:postgres -v `pwd`:/go/src/github.com/mattermost/platform mattermost/builder:latest
+ cd .. && docker run -e TRAVIS_BUILD_NUMBER=$(TRAVIS_BUILD_NUMBER) --link mattermost-mysql:mysql --link mattermost-postgres:postgres -v `pwd`:/go/src/github.com/mattermost mattermost/builder:latest
stop-docker:
@echo Stopping docker containers
@@ -255,7 +255,7 @@ nuke: | clean clean-docker
touch $@
-.prepare-jsx:
+.prepare-jsx: web/react/package.json
@echo Preparation for compiling jsx code
cd web/react/ && npm install