diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-12 16:43:05 -0600 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-12 16:43:05 -0600 |
| commit | b15b2bc2ae3c2c23218e0acf8cfe8a8534d5e616 (patch) | |
| tree | 299dc83e955d276484e11f801a1f701f852250bc | |
| parent | b8c70b4d04a7719fd99a8b01485422d1e69dacfd (diff) | |
| parent | d36af55d57cbfa09c1381f6a0e957ec446b4ced3 (diff) | |
| download | chat-b15b2bc2ae3c2c23218e0acf8cfe8a8534d5e616.tar.gz chat-b15b2bc2ae3c2c23218e0acf8cfe8a8534d5e616.tar.bz2 chat-b15b2bc2ae3c2c23218e0acf8cfe8a8534d5e616.zip | |
Merge pull request #1878 from mattermost/release-1.4
Fixing docker files for 1.4 RC2
| -rw-r--r-- | docker/1.4/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/1.4/Dockerrun.aws.zip | bin | 1046 -> 1043 bytes | |||
| -rwxr-xr-x | docker/1.4/Dockerrun.aws/Dockerrun.aws.json | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/docker/1.4/Dockerfile b/docker/1.4/Dockerfile index 97a863897..1f0acdfc9 100644 --- a/docker/1.4/Dockerfile +++ b/docker/1.4/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v1.4.0-rc1/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v1.4.0-rc2/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 0ea2ad972..91e9a9a2d 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 2d107d41a..654961589 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.4rc2",
+ "Name": "mattermost/platform:1.4",
"Update": "true"
},
"Ports": [
|