summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-07-24 13:50:02 -0400
committerhmhealey <harrisonmhealey@gmail.com>2015-07-24 13:50:02 -0400
commit7355fe578c01db7d1febb04b6b905fda4994b59a (patch)
tree27eb9dd91fba8c65ac58baa1c63e84b20f26d1dd /Makefile
parentf85d37cfb8dca3486d4630e70f2d76fe8dca32b8 (diff)
downloadchat-7355fe578c01db7d1febb04b6b905fda4994b59a.tar.gz
chat-7355fe578c01db7d1febb04b6b905fda4994b59a.tar.bz2
chat-7355fe578c01db7d1febb04b6b905fda4994b59a.zip
Reverted accidental change to the Makefile that occurred while rebasing hmhealey/mm1494 branch
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f8c169f15..222d4ffe4 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ build:
install:
@go get $(GOFLAGS) github.com/tools/godep
- @if [ $(shell docker ps | grep -ci mattermost-mysql) -eq 0 ]; then \
+ @if [ $(shell docker ps -a | grep -ci mattermost-mysql) -eq 0 ]; then \
echo starting mattermost-mysql; \
docker run --name mattermost-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=mostest \
-e MYSQL_USER=mmuser -e MYSQL_PASSWORD=mostest -e MYSQL_DATABASE=mattermost_test -d mysql > /dev/null; \