diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-08-12 13:31:29 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-12 13:31:29 -0400 |
| commit | 95e6626f9f59b876479d8267b6c95105345e661d (patch) | |
| tree | 6ee690f8150a1ce41267ccf8fd5871b72b2f3418 /Makefile | |
| parent | af17764561003900e1d43ed807ad40ee4493e724 (diff) | |
| parent | 083433dc0f60852d4f268b915306d095799a6d1a (diff) | |
| download | chat-95e6626f9f59b876479d8267b6c95105345e661d.tar.gz chat-95e6626f9f59b876479d8267b6c95105345e661d.tar.bz2 chat-95e6626f9f59b876479d8267b6c95105345e661d.zip | |
Merge pull request #367 from mattermost/mm-1884
MM-1184 Updating dockerfiles for latest master and osx
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -245,10 +245,8 @@ dist: install 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-build: stop + docker build -t ${DOCKERNAME} -f docker/local/Dockerfile . docker-run: docker-build docker run --name ${DOCKER_CONTAINER_NAME} -d --publish 8065:80 ${DOCKERNAME} |