diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-07-27 09:48:35 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-07-31 15:51:36 -0400 |
commit | e76fc37b6df7d53ea86a5b42009d5d1161741270 (patch) | |
tree | 23d75891fab6e80365146e2563f40af7b2987b0e /Makefile | |
parent | e699acb808201c160ecfcdad08e1506cd87d174b (diff) | |
download | chat-e76fc37b6df7d53ea86a5b42009d5d1161741270.tar.gz chat-e76fc37b6df7d53ea86a5b42009d5d1161741270.tar.bz2 chat-e76fc37b6df7d53ea86a5b42009d5d1161741270.zip |
Updating dockerfile for 0.6.0-rc1. Moving docker files into versioned directories.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 20 |
1 files changed, 19 insertions, 1 deletions
@@ -1,4 +1,4 @@ -.PHONY: all test clean build install run stop cover dist cleandb travis +.PHONY: all test clean build install run stop cover dist cleandb travis docker GOPATH ?= $(GOPATH:) GOFLAGS ?= $(GOFLAGS:) @@ -24,6 +24,9 @@ DIST_RESULTS=$(DIST_ROOT)/results BENCH=. TESTS=. +DOCKERNAME ?= mm-dev +DOCKER_CONTAINER_NAME ?= mm-test + all: travis travis: @@ -193,6 +196,12 @@ stop: kill $$PID; \ done + @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; \ + docker rm -v ${DOCKER_CONTAINER_NAME} > /dev/null; \ + fi + setup-mac: echo $$(boot2docker ip 2> /dev/null) dockerhost | sudo tee -a /etc/hosts @@ -243,3 +252,12 @@ dist: install rm $(DIST_PATH)/web/templates/*.bak tar -C dist -czf $(DIST_PATH).tar.gz mattermost + +docker-build: stop dist + cp $(DIST_PATH).tar.gz docker/dev + cd docker/dev && docker build -t ${DOCKERNAME} . + rm docker/dev/mattermost.tar.gz + +docker-run: docker-build + docker run --name ${DOCKER_CONTAINER_NAME} -d --publish 8065:80 ${DOCKERNAME} + |