diff options
author | =Corey Hulen <corey@hulen.com> | 2015-07-22 18:05:44 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-07-22 18:05:44 -0800 |
commit | c277a98b5d88c81df39f8e33ef1286f72ac04014 (patch) | |
tree | 0d96238a2ee3ab121ea576db9900311ff5a57ba6 /Dockerfile | |
parent | e0bad6c03784d44210760577550be585daf513b9 (diff) | |
parent | f4c3eaa8c091366a956fa2ab48124190f4f9082b (diff) | |
download | chat-c277a98b5d88c81df39f8e33ef1286f72ac04014.tar.gz chat-c277a98b5d88c81df39f8e33ef1286f72ac04014.tar.bz2 chat-c277a98b5d88c81df39f8e33ef1286f72ac04014.zip |
Merge branch 'master' into mm-1420
Diffstat (limited to 'Dockerfile')
-rw-r--r-- | Dockerfile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile index 5c389c056..e6c04d541 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ WORKDIR /go # # Install SQL -# +# ENV MYSQL_ROOT_PASSWORD=mostest ENV MYSQL_USER=mmuser @@ -60,7 +60,7 @@ RUN echo "deb http://repo.mysql.com/apt/debian/ wheezy mysql-${MYSQL_MAJOR}" > / RUN apt-get update \ && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install mysql-server \ + && apt-get -y install mysql-server \ && rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql @@ -88,12 +88,15 @@ ADD . /go/src/github.com/mattermost/platform ADD ./docker/main.cf /etc/postfix/ RUN go get github.com/tools/godep -RUN cd /go/src/github.com/mattermost/platform; godep restore +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 cd /go/src/github.com/mattermost/platform/web/react; npm install RUN chmod +x /go/src/github.com/mattermost/platform/docker/docker-entry.sh ENTRYPOINT /go/src/github.com/mattermost/platform/docker/docker-entry.sh +# Create default storage directory +RUN mkdir /mattermost/ + # Ports EXPOSE 80 |