venture37

Remove calls to docker in Mattermost

Oct 19th, 2015
194
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.64 KB | None | 0 0
  1. diff --git a/Makefile b/Makefile
  2. index 5e798ee..9de5219 100644
  3. --- a/Makefile
  4. +++ b/Makefile
  5. @@ -129,15 +129,6 @@ build:
  6. install:
  7. @go get $(GOFLAGS) github.com/tools/godep
  8.  
  9. - @if [ $(shell docker ps -a | grep -ci mattermost-mysql) -eq 0 ]; then \
  10. - echo starting mattermost-mysql; \
  11. - docker run --name mattermost-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=mostest \
  12. - -e MYSQL_USER=mmuser -e MYSQL_PASSWORD=mostest -e MYSQL_DATABASE=mattermost_test -d mysql > /dev/null; \
  13. - elif [ $(shell docker ps | grep -ci mattermost-mysql) -eq 0 ]; then \
  14. - echo restarting mattermost-mysql; \
  15. - docker start mattermost-mysql > /dev/null; \
  16. - fi
  17. -
  18. @cd web/react/ && npm install
  19. @cd web/react/ && npm run build-libs
  20.  
  21. @@ -188,12 +179,6 @@ clean:
  22. rm -Rf $(DIST_ROOT)
  23. @$(GO) clean $(GOFLAGS) -i ./...
  24.  
  25. - @if [ $(shell docker ps -a | grep -ci mattermost-mysql) -eq 1 ]; then \
  26. - echo stopping mattermost-mysql; \
  27. - docker stop mattermost-mysql > /dev/null; \
  28. - docker rm -v mattermost-mysql > /dev/null; \
  29. - fi
  30. -
  31. rm -rf web/react/node_modules
  32. rm -f web/static/js/bundle*.js
  33. rm -f web/static/js/libs*.js
  34. @@ -234,15 +219,6 @@ stop:
  35. kill $$PID; \
  36. done
  37.  
  38. - @if [ $(shell docker ps -a | grep -ci ${DOCKER_CONTAINER_NAME}) -eq 1 ]; then \
  39. - echo removing dev docker container; \
  40. - docker stop ${DOCKER_CONTAINER_NAME} > /dev/null; \
  41. - docker rm -v ${DOCKER_CONTAINER_NAME} > /dev/null; \
  42. - fi
  43. -
  44. -setup-mac:
  45. - echo $$(boot2docker ip 2> /dev/null) dockerhost | sudo tee -a /etc/hosts
  46. -
  47. cleandb:
  48. @if [ $(shell docker ps -a | grep -ci mattermost-mysql) -eq 1 ]; then \
  49. docker stop mattermost-mysql > /dev/null; \
Advertisement
Add Comment
Please, Sign In to add comment