diff options
| author | Corey Hulen <corey@hulen.com> | 2015-06-17 10:02:29 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-06-17 10:02:29 -0800 |
| commit | 7455f2621a4d03133edaaf5d52f71173b315b2a7 (patch) | |
| tree | ebb842e66ece35771ed86416db4d03ca4a7decd3 /Dockerfile | |
| parent | 0d6ed4a6ab14c4fc4bbdf4bd0b63c19d896a7b48 (diff) | |
| parent | fd4b0d4aa30d36e34e7d6a6810de397c4126e76f (diff) | |
| download | chat-7455f2621a4d03133edaaf5d52f71173b315b2a7.tar.gz chat-7455f2621a4d03133edaaf5d52f71173b315b2a7.tar.bz2 chat-7455f2621a4d03133edaaf5d52f71173b315b2a7.zip | |
Merge pull request #20 from mattermost/docker-tweaks
MM-1157 Various tweaks to docker requested. HELIUM
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 |