summaryrefslogtreecommitdiffstats
path: root/Dockerfile
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-06-17 08:39:33 -0400
committerChristopher Speller <crspeller@gmail.com>2015-06-17 08:39:33 -0400
commit45f166cc56ff6383d78062ce78ecb6782934416c (patch)
treeecde392adc71c0d72a99de34bbff91d10f4c6c6b /Dockerfile
parenta1c1ab4d00ff499def42c469eac9cf29f567bce6 (diff)
downloadchat-45f166cc56ff6383d78062ce78ecb6782934416c.tar.gz
chat-45f166cc56ff6383d78062ce78ecb6782934416c.tar.bz2
chat-45f166cc56ff6383d78062ce78ecb6782934416c.zip
Resurrecting config_docker.json. Moving docker related files to docker directory. Added copyright info.
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile
index da57550c0..5c389c056 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
+# Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+# See License.txt for license information.
FROM ubuntu:14.04
# Install Dependancies
@@ -83,15 +85,15 @@ RUN wget http://download.redis.io/redis-stable.tar.gz; \
ADD . /go/src/github.com/mattermost/platform
# Insert postfix config
-ADD ./config/main.cf /etc/postfix/
+ADD ./docker/main.cf /etc/postfix/
RUN go get github.com/tools/godep
RUN cd /go/src/github.com/mattermost/platform; godep restore
RUN go install github.com/mattermost/platform
RUN cd /go/src/github.com/mattermost/platform/web/react; npm install
-RUN chmod +x /go/src/github.com/mattermost/platform/docker-entry.sh
-ENTRYPOINT /go/src/github.com/mattermost/platform/docker-entry.sh
+RUN chmod +x /go/src/github.com/mattermost/platform/docker/docker-entry.sh
+ENTRYPOINT /go/src/github.com/mattermost/platform/docker/docker-entry.sh
# Ports
EXPOSE 80