diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-11 09:29:32 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-11 09:29:32 -0400 |
| commit | 6a333f201811b20eda8c0756cd6e27aa8c1b0288 (patch) | |
| tree | 8c23935965e4d4225b3f5b6f32cca099e8bf8395 | |
| parent | e1009fa7fb3a344f8164837e939692aa4b7b3054 (diff) | |
| parent | cd66b096bb7bd0862661419acecebc54cf5ac3e1 (diff) | |
| download | chat-6a333f201811b20eda8c0756cd6e27aa8c1b0288.tar.gz chat-6a333f201811b20eda8c0756cd6e27aa8c1b0288.tar.bz2 chat-6a333f201811b20eda8c0756cd6e27aa8c1b0288.zip | |
Merge pull request #364 from mattermost/release-0.6.0
Merge release back into master.
| -rw-r--r-- | docker/0.6/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/0.6/Dockerrun.aws.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/0.6/Dockerfile b/docker/0.6/Dockerfile index 12698a813..35ba0bd7e 100644 --- a/docker/0.6/Dockerfile +++ b/docker/0.6/Dockerfile @@ -36,7 +36,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v0.6.0-rc2/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v0.6.0/mattermost.tar.gz / RUN tar -zxvf /mattermost.tar.gz --strip-components=1 ADD config_docker.json / ADD docker-entry.sh / diff --git a/docker/0.6/Dockerrun.aws.json b/docker/0.6/Dockerrun.aws.json index ede6dfdfa..f6f7cf726 100755 --- a/docker/0.6/Dockerrun.aws.json +++ b/docker/0.6/Dockerrun.aws.json @@ -1,7 +1,7 @@ {
"AWSEBDockerrunVersion": "1",
"Image": {
- "Name": "mattermost/platform:lithium-rc2",
+ "Name": "mattermost/platform:0.6",
"Update": "true"
},
"Ports": [
|