From 1ad314f79c7e34bad991c2fa9f15d61831d2ba29 Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Wed, 9 Mar 2016 20:31:44 +0000
Subject: [PATCH] Docker updates for 2.1.0-rc1

---
 docker/1.4/Dockerrun.aws.zip                      | Bin 842 -> 0 bytes
 docker/{1.4 => 2.1}/Dockerfile                    |   4 ++--
 docker/2.1/Dockerrun.aws.zip                      | Bin 0 -> 866 bytes
 .../Dockerrun.aws/.ebextensions/01_files.config   |   0
 .../{1.4 => 2.1}/Dockerrun.aws/Dockerrun.aws.json |   2 +-
 docker/{1.4 => 2.1}/README.md                     |   0
 docker/{1.4 => 2.1}/config_docker.json            |   5 +++++
 docker/{1.4 => 2.1}/docker-entry.sh               |   0
 8 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 docker/1.4/Dockerrun.aws.zip
 rename docker/{1.4 => 2.1}/Dockerfile (84%)
 create mode 100644 docker/2.1/Dockerrun.aws.zip
 rename docker/{1.4 => 2.1}/Dockerrun.aws/.ebextensions/01_files.config (100%)
 rename docker/{1.4 => 2.1}/Dockerrun.aws/Dockerrun.aws.json (75%)
 rename docker/{1.4 => 2.1}/README.md (100%)
 rename docker/{1.4 => 2.1}/config_docker.json (94%)
 rename docker/{1.4 => 2.1}/docker-entry.sh (100%)

diff --git a/docker/1.4/Dockerrun.aws.zip b/docker/1.4/Dockerrun.aws.zip
deleted file mode 100644
index 55bc98eea2ce1b5a9654d207c413df84362ee19a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 842
zcmWIWW@Zs#W&nbYCSwl}4Fh~YhF)q?YDGzEUU6oAUa@`vPPH-^YO(9&U}#S6a_95)
zIkFq5Bbt$cK^8-&fnj`FW=?9cUUGh3T4wszbAefh4S3ide4lsd^gQWSM~Rg58<I`Q
zt2;ZjCA}jjUp#zWci{!*FZF`ImbCvDQSvG`P!(NZwZQNKSKrH!YLA)M*Y48~{aN|s
zjGT3_sqg2z+phN2D4v;n^31N&Gb%mxAI%W)v@X`&5X|HHYjf=H#=qCRf4E;Z+izbj
z@5d#vHlu(!N@#0gTW6)%2F*&JiRK<UT#ZfFjP@>l`kY;7QX&V7M}67`BisDsO-kbV
zeb*NJw$f|5Sy5Ij*)9zWFAj!_Ejk__Z5Rcn1ATi5h=qXIB|kYkwWz2xPcN~&STCzM
zKTox1Hy4wkfNS-^`iP+J!h=rRK8JEBHLYlk;IV2u>YFz6%&m_9?^IT{?fgFHw`~8a
zQ#$LHzs+*)H#g#c*d!CpwQQwNuA1bH%7PV+$G+M(9KTX6;P_4C=r`FD-8am?maGeV
zc<!&T%H%`Lv!?tz^=M+mBC+j0(;lu_qsg&_(Ngea%$ZHg)2zNPdVg}K*^Vo>`8T{h
z5qVVPCv$)|Ba=Nd?nDCg3lIo29B>5D=n;=wFDTJKfI!1rM;#y&RWB+J;R@`D2x5{#
r!;;1{43p536tYp+Vg_c^+r}7R3dM}40B=?{kQx>s6a=bJW&-g5L*)_E

diff --git a/docker/1.4/Dockerfile b/docker/2.1/Dockerfile
similarity index 84%
rename from docker/1.4/Dockerfile
rename to docker/2.1/Dockerfile
index 8dcea3927a..71dcd602a3 100644
--- a/docker/1.4/Dockerfile
+++ b/docker/2.1/Dockerfile
@@ -34,8 +34,8 @@ VOLUME /var/lib/mysql
 WORKDIR /mattermost
 
 # Copy over files
-ADD https://github.com/mattermost/platform/releases/download/v1.4.0/mattermost.tar.gz /
-RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz
+ADD https://releases.mattermost.com/mattermost-team-2.1.0-rc1-linux-amd64.tar.gz
+RUN tar -zxvf /mattermost-team-2.1.0-rc1-linux-amd64.tar.gz --strip-components=1 && rm /mattermost-team-2.1.0-rc1-linux-amd64.tar.gz
 ADD config_docker.json /
 ADD docker-entry.sh /
 
diff --git a/docker/2.1/Dockerrun.aws.zip b/docker/2.1/Dockerrun.aws.zip
new file mode 100644
index 0000000000000000000000000000000000000000..19bbc74032c1dd78d04569915fa7832c68d66bf5
GIT binary patch
literal 866
zcmWIWW@h1H0D*6dGd;izD8a`d!=RU%lv+`enpd2epI59O8p6rIY|!x_41`N7xEUB(
zvVe+N@_|GE&>RsU%>g!t&)4V3ZXhq3k%2)L!yE&{__WNN)MCBl{JgZxbbQ8cJr|gD
z*no%a!S{Jir{_txI!UCY-;iudUftQLEqOX~@}<MqmnLpt_R)8m-}2+U-GnlBjZnqZ
zZkwvOi(K=w+YL|dy1IU0)qRGTBZ2Ipmrdexqu*+nFT3I>baHo(=d>U0r>6VNv95R%
zpz%ZL@6k1X74lwRz0Y~;+4Ji2%7)6Ui*Md;<jFQmJm#4aW@2d7<!IKkNYeIq%<C`u
zn)dbu7h9UsRrVc9DEW1__u`6sGBUgqY-PolviQA;x%H3}HAD>8_bE>YhR7u#76OKd
zOMY^8YEe;Xo?c>kv0hejejdJH(CyjHb;v=$wfbN^M{xJ*uu12_6+1W<i6w1(k;a);
zekdhL_|yAyDZ#wo=M^uX?YD`?tp9c5?&IID3vT`RZiS|y)4YR1Y0U*Z*Q_<Id?%eZ
z%V<fMDa)F3<I2>hOqx$t|J)(;KCE7cUoH5x!)?3TJqm@&4`!bExUoUjZCh%|k~Y2T
z+#VaQfA;z;Tov!O{>~qrnOu7XeW%z5cr!A|G2==;5<stlfB?f=M-Yvkm{=i+2_qqa
z%*2(HAZ7wn6~mH7P-;ar6C+^}X9a59Agp-X7zMNmTTJ0Hmz53VQDz|I2kNwC0`UMN
C&lTzb

literal 0
HcmV?d00001

diff --git a/docker/1.4/Dockerrun.aws/.ebextensions/01_files.config b/docker/2.1/Dockerrun.aws/.ebextensions/01_files.config
similarity index 100%
rename from docker/1.4/Dockerrun.aws/.ebextensions/01_files.config
rename to docker/2.1/Dockerrun.aws/.ebextensions/01_files.config
diff --git a/docker/1.4/Dockerrun.aws/Dockerrun.aws.json b/docker/2.1/Dockerrun.aws/Dockerrun.aws.json
similarity index 75%
rename from docker/1.4/Dockerrun.aws/Dockerrun.aws.json
rename to docker/2.1/Dockerrun.aws/Dockerrun.aws.json
index 6549615894..a52309aad4 100755
--- a/docker/1.4/Dockerrun.aws/Dockerrun.aws.json
+++ b/docker/2.1/Dockerrun.aws/Dockerrun.aws.json
@@ -1,7 +1,7 @@
 {
   "AWSEBDockerrunVersion": "1",
   "Image": {
-    "Name": "mattermost/platform:1.4",
+    "Name": "mattermost/platform:2.1",
     "Update": "true"
   },
   "Ports": [
diff --git a/docker/1.4/README.md b/docker/2.1/README.md
similarity index 100%
rename from docker/1.4/README.md
rename to docker/2.1/README.md
diff --git a/docker/1.4/config_docker.json b/docker/2.1/config_docker.json
similarity index 94%
rename from docker/1.4/config_docker.json
rename to docker/2.1/config_docker.json
index 1aa2ee843f..6a12901893 100644
--- a/docker/1.4/config_docker.json
+++ b/docker/2.1/config_docker.json
@@ -7,11 +7,14 @@
         "EnableOAuthServiceProvider": false,
         "EnableIncomingWebhooks": false,
         "EnableOutgoingWebhooks": false,
+        "EnableCommands": false,
+        "EnableOnlyAdminIntegrations": true,
         "EnablePostUsernameOverride": false,
         "EnablePostIconOverride": false,
         "EnableTesting": false,
         "EnableDeveloper": false,
         "EnableSecurityFixAlert": true,
+        "EnableInsecureOutgoingConnections": false,
         "SessionLengthWebInDays" : 30,
         "SessionLengthMobileInDays" : 30,
         "SessionLengthSSOInDays" : 30,
@@ -66,6 +69,8 @@
     },
     "EmailSettings": {
         "EnableSignUpWithEmail": true,
+        "EnableSignInWithEmail": true,
+        "EnableSignInWithUsername": false,
         "SendEmailNotifications": false,
         "RequireEmailVerification": false,
         "FeedbackName": "",
diff --git a/docker/1.4/docker-entry.sh b/docker/2.1/docker-entry.sh
similarity index 100%
rename from docker/1.4/docker-entry.sh
rename to docker/2.1/docker-entry.sh