8 files changed, 35 insertions, 6 deletions
diff --git a/docker/1.0/Dockerrun.aws.zip b/docker/1.0/Dockerrun.aws.zip
deleted file mode 100644
index 8c2c16e10..000000000
--- a/docker/1.0/Dockerrun.aws.zip
+++ /dev/null
diff --git a/docker/1.0/Dockerfile b/docker/1.2/Dockerfile
index a41c73514..6a8d69196 100644
--- a/docker/1.0/Dockerfile
+++ b/docker/1.2/Dockerfile
@@ -34,7 +34,7 @@ VOLUME /var/lib/mysql
 WORKDIR /mattermost
 
 # Copy over files
-ADD https://github.com/mattermost/platform/releases/download/v1.0.0/mattermost.tar.gz /
+ADD https://github.com/mattermost/platform/releases/download/v1.2.0-rc1/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.2/Dockerrun.aws.zip b/docker/1.2/Dockerrun.aws.zip
new file mode 100644
index 000000000..4de6ec362
--- /dev/null
+++ b/docker/1.2/Dockerrun.aws.zip
diff --git a/docker/1.0/Dockerrun.aws/.ebextensions/01_files.config b/docker/1.2/Dockerrun.aws/.ebextensions/01_files.config
index 7f40a8b34..7f40a8b34 100644
--- a/docker/1.0/Dockerrun.aws/.ebextensions/01_files.config
+++ b/docker/1.2/Dockerrun.aws/.ebextensions/01_files.config
diff --git a/docker/1.0/Dockerrun.aws/Dockerrun.aws.json b/docker/1.2/Dockerrun.aws/Dockerrun.aws.json
index 9fdded15e..c32a998e4 100755
--- a/docker/1.0/Dockerrun.aws/Dockerrun.aws.json
+++ b/docker/1.2/Dockerrun.aws/Dockerrun.aws.json
@@ -1,7 +1,7 @@
 {
   "AWSEBDockerrunVersion": "1",
   "Image": {
-    "Name": "mattermost/platform:1.0",
+    "Name": "mattermost/platform:1.2",
     "Update": "true"
   },
   "Ports": [
diff --git a/docker/1.2/README.md b/docker/1.2/README.md
new file mode 100644
index 000000000..f737a1554
--- /dev/null
+++ b/docker/1.2/README.md
@@ -0,0 +1,23 @@
+Mattermost
+==========
+
+http:/mattermost.org
+
+Mattermost is an open-source team communication service. It brings team messaging and file sharing into one place, accessible across PCs and phones, with archiving and search.
+
+Installing Mattermost
+=====================
+
+To run an instance of the latest version of mattermost on your local machine you can run:
+
+`docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform`
+
+To update this image to the latest version you can run:
+
+`docker pull mattermost/platform`
+
+To run an instance of the latest code from the master branch on GitHub you can run:
+
+`docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:dev`
+
+Any questions, please visit http://forum.mattermost.org
diff --git a/docker/1.0/config_docker.json b/docker/1.2/config_docker.json
index 806071376..80e6ab14e 100644
--- a/docker/1.0/config_docker.json
+++ b/docker/1.2/config_docker.json
@@ -5,15 +5,21 @@
         "SegmentDeveloperKey": "",
         "GoogleDeveloperKey": "",
         "EnableOAuthServiceProvider": false,
-        "EnableIncomingWebhooks": false,
-        "EnableTesting": false
+        "EnableIncomingWebhooks": true,
+        "EnableOutgoingWebhooks": true,
+        "EnablePostUsernameOverride": false,
+        "EnablePostIconOverride": false,
+        "EnableTesting": false,
+        "EnableSecurityFixAlert": true
     },
     "TeamSettings": {
         "SiteName": "Mattermost",
         "MaxUsersPerTeam": 50,
         "EnableTeamCreation": true,
         "EnableUserCreation": true,
-        "RestrictCreationToDomains": ""
+        "RestrictCreationToDomains": "",
+        "RestrictTeamNames": true,
+        "EnableTeamListing": false
     },
     "SqlSettings": {
         "DriverName": "mysql",
@@ -86,4 +92,4 @@
         "TokenEndpoint": "",
         "UserApiEndpoint": ""
     }
-}
-\ No newline at end of file
+}
diff --git a/docker/1.0/docker-entry.sh b/docker/1.2/docker-entry.sh
index 6bd2a1263..6bd2a1263 100755
--- a/docker/1.0/docker-entry.sh
+++ b/docker/1.2/docker-entry.sh