From e89e82cf70cd7d08f3d1cb74d101898111ad2596 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 9 Nov 2015 14:22:12 -0500 Subject: [PATCH] Updating dockerfile for release v1.2.0-rc1 --- docker/1.0/Dockerrun.aws.zip | Bin 711 -> 0 bytes docker/{1.0 => 1.2}/Dockerfile | 2 +- docker/1.2/Dockerrun.aws.zip | Bin 0 -> 867 bytes .../.ebextensions/01_files.config | 0 .../Dockerrun.aws/Dockerrun.aws.json | 2 +- docker/1.2/README.md | 23 ++++++++++++++++++ docker/{1.0 => 1.2}/config_docker.json | 14 ++++++++--- docker/{1.0 => 1.2}/docker-entry.sh | 0 8 files changed, 35 insertions(+), 6 deletions(-) delete mode 100644 docker/1.0/Dockerrun.aws.zip rename docker/{1.0 => 1.2}/Dockerfile (97%) create mode 100644 docker/1.2/Dockerrun.aws.zip rename docker/{1.0 => 1.2}/Dockerrun.aws/.ebextensions/01_files.config (100%) rename docker/{1.0 => 1.2}/Dockerrun.aws/Dockerrun.aws.json (75%) create mode 100644 docker/1.2/README.md rename docker/{1.0 => 1.2}/config_docker.json (87%) rename docker/{1.0 => 1.2}/docker-entry.sh (100%) diff --git a/docker/1.0/Dockerrun.aws.zip b/docker/1.0/Dockerrun.aws.zip deleted file mode 100644 index 8c2c16e10802d050a41a4a3846ad9ed5834d4df7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 711 zcmWIWW@Zs#U|`^2XtA+z|F-FR?F=CA5)cb9$S}C%CugS?6_w`cC6*WKWfkY=g@$l4 zFl(rBhP?&i(h6<{MwS=M3=AwOKpnb0ySWZI2)I@stmg>so?SBOoI97Ji@;WaZpZ7Y zGwyOu?({ve-+J~|sdu)|&l${5m0XkmJZtmf=f{n{Kg`;>TGL^sBV)Jcjp~xHZbh}T z?q3X>+yzh1vog$W{-pLTb>o@KUVFWNJI(ZYc+V;4_?M3^I&+(;}3vnvsD)7U)O4)TGpk zlGME7%>2A!eFMYzw9K5;V!h=2ytK@8uy=b^v3hswxxlQ$20UyJzRzdsDW$C}F7r~Pn0HQi^9b;X+ijUP&XkFNQvkoWrPea>6Y zo>!k&HdJO^eDiiAPqta&G0&7R6GN*mN3)(qlD5BNUVqWow6`y~*wUP?vhPqr$*;S; z7gyYqk>QKr28Yk6{HX8^}>iKnRM)Zy)FQ4zXiRaq)({-B8jc1qy2H++1sBoj7s^o$X+^bEVP|T?&KePu?z2yA7 zw9It4u~>p_>$$+J!v;KT55CWHIz3Oi)kz{H{f1;y^6Jh`ZOPM_lP?{V3{z&z@JGS2k2;U3~L)BTu$j;xW&ZFcU+o zE=RMTMUu9^V_tvJ*R;1UxY*L1uCnh?LdmbYy%$&9lab+_U@I%Wl*R8&%&mu<0p5&E za?H5Wj|4cBfx*M@wh_d{mYP^0sR<*bLFVF$Gl;ni3<3;q9iITrMUO$CnOI{F;a1G} hL%4NGqYlu?sAgisCN3*j*+3p;210(IA$Ck49sqTU9RC0S literal 0 HcmV?d00001 diff --git a/docker/1.0/Dockerrun.aws/.ebextensions/01_files.config b/docker/1.2/Dockerrun.aws/.ebextensions/01_files.config similarity index 100% rename from docker/1.0/Dockerrun.aws/.ebextensions/01_files.config rename to 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 similarity index 75% rename from docker/1.0/Dockerrun.aws/Dockerrun.aws.json rename to docker/1.2/Dockerrun.aws/Dockerrun.aws.json index 9fdded15e5..c32a998e4f 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 0000000000..f737a15549 --- /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 similarity index 87% rename from docker/1.0/config_docker.json rename to docker/1.2/config_docker.json index 8060713769..80e6ab14ed 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 similarity index 100% rename from docker/1.0/docker-entry.sh rename to docker/1.2/docker-entry.sh