diff options
Diffstat (limited to 'docker')
-rw-r--r-- | docker/1.1/Dockerrun.aws.zip | bin | 710 -> 0 bytes | |||
-rw-r--r-- | docker/1.3/Dockerfile (renamed from docker/1.1/Dockerfile) | 2 | ||||
-rw-r--r-- | docker/1.3/Dockerrun.aws.zip | bin | 0 -> 867 bytes | |||
-rw-r--r-- | docker/1.3/Dockerrun.aws/.ebextensions/01_files.config (renamed from docker/1.1/Dockerrun.aws/.ebextensions/01_files.config) | 0 | ||||
-rwxr-xr-x | docker/1.3/Dockerrun.aws/Dockerrun.aws.json (renamed from docker/1.1/Dockerrun.aws/Dockerrun.aws.json) | 2 | ||||
-rw-r--r-- | docker/1.3/README.md | 23 | ||||
-rw-r--r-- | docker/1.3/config_docker.json (renamed from docker/1.1/config_docker.json) | 12 | ||||
-rwxr-xr-x | docker/1.3/docker-entry.sh (renamed from docker/1.1/docker-entry.sh) | 0 |
8 files changed, 32 insertions, 7 deletions
diff --git a/docker/1.1/Dockerrun.aws.zip b/docker/1.1/Dockerrun.aws.zip Binary files differdeleted file mode 100644 index 945168a71..000000000 --- a/docker/1.1/Dockerrun.aws.zip +++ /dev/null diff --git a/docker/1.1/Dockerfile b/docker/1.3/Dockerfile index 92bac6a04..55b69673a 100644 --- a/docker/1.1/Dockerfile +++ b/docker/1.3/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v1.1.0/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v1.3.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.3/Dockerrun.aws.zip b/docker/1.3/Dockerrun.aws.zip Binary files differnew file mode 100644 index 000000000..dd201d990 --- /dev/null +++ b/docker/1.3/Dockerrun.aws.zip diff --git a/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config b/docker/1.3/Dockerrun.aws/.ebextensions/01_files.config index 7f40a8b34..7f40a8b34 100644 --- a/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config +++ b/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 index 042e79bd3..d4027e67c 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 000000000..f737a1554 --- /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 index 653b6ffd7..a35abb9da 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 index 6bd2a1263..6bd2a1263 100755 --- a/docker/1.1/docker-entry.sh +++ b/docker/1.3/docker-entry.sh |