diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-01-12 16:40:18 -0600 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-01-12 16:40:18 -0600 |
| commit | 837de1e0c871342a9c87d04ec08636f0847f5bc7 (patch) | |
| tree | e63903a917a8b375a297d1f08c3ae3207d4d050b /docker | |
| parent | 6ce6115100aea3b11e113cc805abfaff89af12c4 (diff) | |
| download | chat-837de1e0c871342a9c87d04ec08636f0847f5bc7.tar.gz chat-837de1e0c871342a9c87d04ec08636f0847f5bc7.tar.bz2 chat-837de1e0c871342a9c87d04ec08636f0847f5bc7.zip | |
Fixing docker files for 1.4 RC2
Diffstat (limited to 'docker')
| -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 | ||||
| -rw-r--r-- | docker/1.4/config_docker.json | 21 |
4 files changed, 4 insertions, 21 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": [
diff --git a/docker/1.4/config_docker.json b/docker/1.4/config_docker.json index 1aa2ee843..a35abb9da 100644 --- a/docker/1.4/config_docker.json +++ b/docker/1.4/config_docker.json @@ -10,12 +10,7 @@ "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, - "EnableDeveloper": false, - "EnableSecurityFixAlert": true, - "SessionLengthWebInDays" : 30, - "SessionLengthMobileInDays" : 30, - "SessionLengthSSOInDays" : 30, - "SessionCacheInMinutes" : 10 + "EnableSecurityFixAlert": true }, "TeamSettings": { "SiteName": "Mattermost", @@ -58,11 +53,7 @@ "AmazonS3AccessKeyId": "", "AmazonS3SecretAccessKey": "", "AmazonS3Bucket": "", - "AmazonS3Region": "", - "AmazonS3Endpoint": "", - "AmazonS3BucketEndpoint": "", - "AmazonS3LocationConstraint": false, - "AmazonS3LowercaseBucket": false + "AmazonS3Region": "" }, "EmailSettings": { "EnableSignUpWithEmail": true, @@ -91,14 +82,6 @@ "ShowEmailAddress": true, "ShowFullName": true }, - "SupportSettings": { - "TermsOfServiceLink": "/static/help/terms.html", - "PrivacyPolicyLink": "/static/help/privacy.html", - "AboutLink": "/static/help/about.html", - "HelpLink": "/static/help/help.html", - "ReportAProblemLink": "/static/help/report_problem.html", - "SupportEmail": "feedback@mattermost.com" - }, "GitLabSettings": { "Enable": false, "Secret": "", |