From 92d0dad18bc0b25fcf15ffb23314a7291f0ce2ce Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 9 Dec 2015 14:45:03 -0500 Subject: [PATCH] Updating dockerfile for release v1.3.0-rc1 --- docker/1.1/Dockerrun.aws.zip | Bin 710 -> 0 bytes docker/{1.1 => 1.3}/Dockerfile | 2 +- docker/1.3/Dockerrun.aws.zip | Bin 0 -> 867 bytes .../.ebextensions/01_files.config | 0 .../Dockerrun.aws/Dockerrun.aws.json | 2 +- docker/1.3/README.md | 23 ++++++++++++++++++ docker/{1.1 => 1.3}/config_docker.json | 12 +++++---- docker/{1.1 => 1.3}/docker-entry.sh | 0 8 files changed, 32 insertions(+), 7 deletions(-) delete mode 100644 docker/1.1/Dockerrun.aws.zip rename docker/{1.1 => 1.3}/Dockerfile (97%) create mode 100644 docker/1.3/Dockerrun.aws.zip rename docker/{1.1 => 1.3}/Dockerrun.aws/.ebextensions/01_files.config (100%) rename docker/{1.1 => 1.3}/Dockerrun.aws/Dockerrun.aws.json (75%) create mode 100644 docker/1.3/README.md rename docker/{1.1 => 1.3}/config_docker.json (90%) rename docker/{1.1 => 1.3}/docker-entry.sh (100%) diff --git a/docker/1.1/Dockerrun.aws.zip b/docker/1.1/Dockerrun.aws.zip deleted file mode 100644 index 945168a714b636ba64e27d5b5ca47a0bedd2ed00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 710 zcmWIWW@Zs#U|`^2IN0Ffe*E&Wzte%dOF%5dAj9C2pPZdqR8*R$msnn`msOmf7aGFJ zz`W{=SlBKgF0J5ZU}Sm0%)r2s0@R_~vzzOXgMe%G!FrD9?rba1=gO@LN*z%hM;E*n zI`gjO&B+stOxu-8lRqS5qf`XPow+fmBnti6>Dvj3$-6iJo9p6gREPdmQ|4R z^w(283od;2`K(+O@4EiZzlNONdtGX$OSR6-S|yyL&vR{ct}u-Di$<#hU<)A4-3ZuKBBw_xkF6 z&Rfr(SD#llRAya#^L8Uowprpa&y+9|L#r-Fvz|qgw!dRuf6>>pw=cNZ(wwfc?@&U? zue-e$SKO14;hkVBE54M)?@i3DhnxZ4j7)OOxT0MG7&;6Lz~Etc+X!M|O9ZTtM1U3~ n$mU{(HNxB_jgNum5(s&q6<9(&z?+o~gmJcHgq2osGcdBeU}j)oNdfB6?b*$B$U(rh`d~draCi2Gi6#5E99;yq3Us@g zdmHQ)Rui5*p}t%#+w@NLxw&;#CygTR>;FE>7ccLA<>>6i+YWKKvRR&SdnmA`Jm||T zmH9arI1U3@NLYc);q&!5vKwelG$R9pEQUD-hVf~cIjO~Z$@zI{ znd$h9-FhxC>#zY2+k@}(oKDY^ZgrAKNxvc4l)SpLQ(N+M=HyF>8npsogeJaTmGfXSW-k+;w&R!m9fWF-HQ~Lob`e=SIKPFkg1XQRw9E9?xk% z+)qvSnPXk?CP3qd(%++N{wn0XzIvbY*0bl;=amhWSr^~D-N=(|mUzrFCCtRos>{)= zXOX1s@0izL^fm463of=ar>pEclu+{PZtukv_he*vC)mo0FJXy z^dkWdWnl0yyln(Av85(fNNU0eX^^?N;tXOg1A_p=TgN9rbJ1fEXeQR!L%0<){t#|m e(x?M;GOC#vv5CtHRyL4FnSqcWXowvXhz9^=W)Zdk literal 0 HcmV?d00001 diff --git a/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config b/docker/1.3/Dockerrun.aws/.ebextensions/01_files.config similarity index 100% rename from docker/1.1/Dockerrun.aws/.ebextensions/01_files.config rename to docker/1.3/Dockerrun.aws/.ebextensions/01_files.config diff --git a/docker/1.1/Dockerrun.aws/Dockerrun.aws.json b/docker/1.3/Dockerrun.aws/Dockerrun.aws.json similarity index 75% rename from docker/1.1/Dockerrun.aws/Dockerrun.aws.json rename to docker/1.3/Dockerrun.aws/Dockerrun.aws.json index 042e79bd3f..d4027e67cb 100755 --- a/docker/1.1/Dockerrun.aws/Dockerrun.aws.json +++ b/docker/1.3/Dockerrun.aws/Dockerrun.aws.json @@ -1,7 +1,7 @@ { "AWSEBDockerrunVersion": "1", "Image": { - "Name": "mattermost/platform:1.1", + "Name": "mattermost/platform:1.3", "Update": "true" }, "Ports": [ diff --git a/docker/1.3/README.md b/docker/1.3/README.md new file mode 100644 index 0000000000..f737a15549 --- /dev/null +++ b/docker/1.3/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.1/config_docker.json b/docker/1.3/config_docker.json similarity index 90% rename from docker/1.1/config_docker.json rename to docker/1.3/config_docker.json index 653b6ffd74..a35abb9da8 100644 --- a/docker/1.1/config_docker.json +++ b/docker/1.3/config_docker.json @@ -5,7 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, @@ -16,7 +17,9 @@ "MaxUsersPerTeam": 50, "EnableTeamCreation": true, "EnableUserCreation": true, - "RestrictCreationToDomains": "" + "RestrictCreationToDomains": "", + "RestrictTeamNames": true, + "EnableTeamListing": false }, "SqlSettings": { "DriverName": "mysql", @@ -65,9 +68,8 @@ "ConnectionSecurity": "", "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS", "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL", - "ApplePushServer": "", - "ApplePushCertPublic": "", - "ApplePushCertPrivate": "" + "SendPushNotifications": false, + "PushNotificationServer": "" }, "RateLimitSettings": { "EnableRateLimiter": true, diff --git a/docker/1.1/docker-entry.sh b/docker/1.3/docker-entry.sh similarity index 100% rename from docker/1.1/docker-entry.sh rename to docker/1.3/docker-entry.sh