diff options
author | Corey Hulen <corey@hulen.com> | 2015-07-21 10:29:29 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-07-21 10:29:29 -0800 |
commit | dc250d77310e8b38b445bcaa4ae8f2d5df97cc1e (patch) | |
tree | 54150b68d459f12a0cc0f31d8638f8bcb3298549 | |
parent | 7a8ed5cf05c24671af2f1629c454615de9a39545 (diff) | |
parent | 74ff46bb987c0ed8594ace4b8d4bd15b14b1ef7e (diff) | |
download | chat-dc250d77310e8b38b445bcaa4ae8f2d5df97cc1e.tar.gz chat-dc250d77310e8b38b445bcaa4ae8f2d5df97cc1e.tar.bz2 chat-dc250d77310e8b38b445bcaa4ae8f2d5df97cc1e.zip |
Merge pull request #210 from hmhealey/makefile
Changed Makefile to restart existing mysql/redis containers if they've been stopped
-rw-r--r-- | Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -41,17 +41,23 @@ 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 restoring go libs using godep; \ $(GOPATH)/bin/godep restore; \ 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; \ + elif [ $(shell docker ps | grep -ci mattermost-mysql) -eq 0 ]; then \ + echo restarting mattermost-mysql; \ + docker start mattermost-mysql > /dev/null; \ fi - @if [ $(shell docker ps | grep -ci mattermost-redis) -eq 0 ]; then \ + @if [ $(shell docker ps -a | grep -ci mattermost-redis) -eq 0 ]; then \ echo starting mattermost-redis; \ docker run --name mattermost-redis -p 6379:6379 -d redis > /dev/null; \ + elif [ $(shell docker ps | grep -ci mattermost-redis) -eq 0 ]; then \ + echo restarting mattermost-redis; \ + docker start mattermost-redis > /dev/null; \ fi @cd web/react/ && npm install |