diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-17 11:09:50 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-17 11:09:50 -0700 |
| commit | f99ad06c19379a9279af0c260d9daceefc7fe944 (patch) | |
| tree | 149d035c6a1be5cd96026c5ed4727084954334fc /Dockerfile | |
| parent | cafbada5148546750ec50af8a5e754d22ebf5059 (diff) | |
| parent | 8265b32b8bd0ccd7929c018eb162f5f059dd13d7 (diff) | |
| download | chat-f99ad06c19379a9279af0c260d9daceefc7fe944.tar.gz chat-f99ad06c19379a9279af0c260d9daceefc7fe944.tar.bz2 chat-f99ad06c19379a9279af0c260d9daceefc7fe944.zip | |
Merge pull request #5 from mattermost/master
to me
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 8 |
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 |