diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-12 14:46:06 -0600 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-12 14:46:06 -0600 |
| commit | b8c70b4d04a7719fd99a8b01485422d1e69dacfd (patch) | |
| tree | 321047afaf41986dcf8fc7e775e6e186e6d3b041 /docker | |
| parent | cc746dda6acbcba3645bafcb368104f78ce1aeae (diff) | |
| parent | 6ce6115100aea3b11e113cc805abfaff89af12c4 (diff) | |
| download | chat-b8c70b4d04a7719fd99a8b01485422d1e69dacfd.tar.gz chat-b8c70b4d04a7719fd99a8b01485422d1e69dacfd.tar.bz2 chat-b8c70b4d04a7719fd99a8b01485422d1e69dacfd.zip | |
Merge pull request #1876 from mattermost/release-1.4
Release 1.4 RC2
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/1.4/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/1.4/Dockerrun.aws.zip | bin | 1043 -> 1046 bytes | |||
| -rwxr-xr-x | docker/1.4/Dockerrun.aws/Dockerrun.aws.json | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/1.4/Dockerfile b/docker/1.4/Dockerfile index 0e8b8853f..97a863897 100644 --- a/docker/1.4/Dockerfile +++ b/docker/1.4/Dockerfile @@ -34,8 +34,8 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -RUN wget --no-check-certificate https://s3.amazonaws.com/mattermost-travis-master/mattermost.tar.gz -RUN tar -zxvf mattermost.tar.gz --strip-components=1 && rm mattermost.tar.gz +ADD https://github.com/mattermost/platform/releases/download/v1.4.0-rc1/mattermost.tar.gz / +RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz ADD config_docker.json / ADD docker-entry.sh / diff --git a/docker/1.4/Dockerrun.aws.zip b/docker/1.4/Dockerrun.aws.zip Binary files differindex 272ea9c54..0ea2ad972 100644 --- a/docker/1.4/Dockerrun.aws.zip +++ b/docker/1.4/Dockerrun.aws.zip diff --git a/docker/1.4/Dockerrun.aws/Dockerrun.aws.json b/docker/1.4/Dockerrun.aws/Dockerrun.aws.json index 654961589..2d107d41a 100755 --- a/docker/1.4/Dockerrun.aws/Dockerrun.aws.json +++ b/docker/1.4/Dockerrun.aws/Dockerrun.aws.json @@ -1,7 +1,7 @@ {
"AWSEBDockerrunVersion": "1",
"Image": {
- "Name": "mattermost/platform:1.4",
+ "Name": "mattermost/platform:1.4rc2",
"Update": "true"
},
"Ports": [
|