Docker updates for 2.1.0-rc1

8 files changed, 8 insertions, 3 deletions

diff --git a/docker/1.4/Dockerrun.aws.zip b/docker/1.4/Dockerrun.aws.zip
deleted file mode 100644
index 55bc98eea..000000000
--- a/docker/1.4/Dockerrun.aws.zip
+++ /dev/null
diff --git a/docker/1.4/Dockerfile b/docker/2.1/Dockerfile
index 8dcea3927..71dcd602a 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 000000000..19bbc7403
--- /dev/null
+++ b/docker/2.1/Dockerrun.aws.zip
diff --git a/docker/1.4/Dockerrun.aws/.ebextensions/01_files.config b/docker/2.1/Dockerrun.aws/.ebextensions/01_files.config
index 7f40a8b34..7f40a8b34 100644
--- a/docker/1.4/Dockerrun.aws/.ebextensions/01_files.config
+++ b/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
index 654961589..a52309aad 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
index f737a1554..f737a1554 100644
--- a/docker/1.4/README.md
+++ b/docker/2.1/README.md
diff --git a/docker/1.4/config_docker.json b/docker/2.1/config_docker.json
index 1aa2ee843..6a1290189 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
index 6bd2a1263..6bd2a1263 100755
--- a/docker/1.4/docker-entry.sh
+++ b/docker/2.1/docker-entry.sh