From 837de1e0c871342a9c87d04ec08636f0847f5bc7 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 12 Jan 2016 16:40:18 -0600
Subject: [PATCH 1/2] Fixing docker files for 1.4 RC2

---
 docker/1.4/Dockerfile                       |   2 +-
 docker/1.4/Dockerrun.aws.zip                | Bin 1046 -> 1043 bytes
 docker/1.4/Dockerrun.aws/Dockerrun.aws.json |   2 +-
 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 97a863897d..1f0acdfc97 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
index 0ea2ad97250113e967f1663d11adb50822afc928..91e9a9a2dfa519b90f9d51428b785e47220645e3 100644
GIT binary patch
delta 429
zcmbQnF`0uez?+$civa|hle^p}@+nExHB1dNJCYgpl~IHNP1ef*Lso==0|>!-r`WSw
zLiA3&b&Kg@%j9j0X7wP`GJzOmnr_c-u0sw2uGI(YIfA>h4>(==sl_7bc*RLa?5@ti
zH-0mGa-9C%ow?>}!F$W{UoTZoC)DnLV{TnjD-$T5-*<~kSw!-Qfpn|$hI^hDvnSPT
za#UtH{YE3<^s<$@(>)fRcz$||(ED3^bo<qUpF7-EthG@t)OLL^@y!2Z#^|1$)h|4F
zW7mmIc(CC4%xCUj_I1VW{266rTBSTo!#=>9o#UeoqrePcFkAxS0B=SnQD#K2Oy107
zAOQ;(49VY2c4(4_K$#rK?5hY3l`x1-h~&i<9S^vbllL=Q%E3Y^z?+o~6dx==7|Y1O
Juz(4~0{}b?lV$(_

delta 432
zcmbQtF^z*Sz?+$civa{?<!F0M<WrJ59y>KGm}N@XS4I&AG+8eL3|SEd4j=^Uonp^^
z#&ilu@5EcTm^=z6Z(}s8-wiZv1rUQw)9u;Kb;v=$wfbN^M{sxc5vNN(wO9lluQ=(j
z#ZFHsQ}<CbQ~dwV?^@Q5?{lp0R!m9VuxoDlYh7FWX*+qtPy2c@cJUO=;5l?}@#c*$
zOpeyLtQWNDiuiV=W2N>K^NsqSUN+7DY|`^;Y28AeO$FJGx9x0g1wFil58BTBe_t?1
zgJaskO;WpJ&M6#>JFk3}|4EGGoTAUJW}=qDTUY!6`jnkRbi;>;*}#yv3d8~4j7*};
zh>)4QfyqDu7Bm==KbY*$BoW~<*^k**5gIUI5S<W7k3t;}xRsOlFk8yO0xQ6ql?@an
PEI=5`$iT3e3B&^c{1cC$

diff --git a/docker/1.4/Dockerrun.aws/Dockerrun.aws.json b/docker/1.4/Dockerrun.aws/Dockerrun.aws.json
index 2d107d41ab..6549615894 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 1aa2ee843f..a35abb9da8 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": "",

From d36af55d57cbfa09c1381f6a0e957ec446b4ced3 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 12 Jan 2016 16:42:31 -0600
Subject: [PATCH 2/2] Fixing config file

---
 docker/1.4/config_docker.json | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/docker/1.4/config_docker.json b/docker/1.4/config_docker.json
index a35abb9da8..1aa2ee843f 100644
--- a/docker/1.4/config_docker.json
+++ b/docker/1.4/config_docker.json
@@ -10,7 +10,12 @@
         "EnablePostUsernameOverride": false,
         "EnablePostIconOverride": false,
         "EnableTesting": false,
-        "EnableSecurityFixAlert": true
+        "EnableDeveloper": false,
+        "EnableSecurityFixAlert": true,
+        "SessionLengthWebInDays" : 30,
+        "SessionLengthMobileInDays" : 30,
+        "SessionLengthSSOInDays" : 30,
+        "SessionCacheInMinutes" : 10
     },
     "TeamSettings": {
         "SiteName": "Mattermost",
@@ -53,7 +58,11 @@
         "AmazonS3AccessKeyId": "",
         "AmazonS3SecretAccessKey": "",
         "AmazonS3Bucket": "",
-        "AmazonS3Region": ""
+        "AmazonS3Region": "",
+        "AmazonS3Endpoint": "",
+        "AmazonS3BucketEndpoint": "",
+        "AmazonS3LocationConstraint": false,
+        "AmazonS3LowercaseBucket": false
     },
     "EmailSettings": {
         "EnableSignUpWithEmail": true,
@@ -82,6 +91,14 @@
         "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": "",