diff options
Diffstat (limited to 'docker')
-rw-r--r-- | docker/1.4/Dockerrun.aws.zip | bin | 842 -> 0 bytes | |||
-rw-r--r-- | docker/2.0/Dockerfile | 2 | ||||
-rw-r--r-- | docker/2.1/Dockerfile (renamed from docker/1.4/Dockerfile) | 4 | ||||
-rw-r--r-- | docker/2.1/Dockerrun.aws.zip | bin | 0 -> 866 bytes | |||
-rw-r--r-- | docker/2.1/Dockerrun.aws/.ebextensions/01_files.config (renamed from docker/1.4/Dockerrun.aws/.ebextensions/01_files.config) | 0 | ||||
-rwxr-xr-x | docker/2.1/Dockerrun.aws/Dockerrun.aws.json (renamed from docker/1.4/Dockerrun.aws/Dockerrun.aws.json) | 2 | ||||
-rw-r--r-- | docker/2.1/README.md (renamed from docker/1.4/README.md) | 0 | ||||
-rw-r--r-- | docker/2.1/config_docker.json (renamed from docker/1.4/config_docker.json) | 5 | ||||
-rwxr-xr-x | docker/2.1/docker-entry.sh (renamed from docker/1.4/docker-entry.sh) | 0 |
9 files changed, 9 insertions, 4 deletions
diff --git a/docker/1.4/Dockerrun.aws.zip b/docker/1.4/Dockerrun.aws.zip Binary files differdeleted file mode 100644 index 55bc98eea..000000000 --- a/docker/1.4/Dockerrun.aws.zip +++ /dev/null diff --git a/docker/2.0/Dockerfile b/docker/2.0/Dockerfile index 0f7a13e45..38cb1e197 100644 --- a/docker/2.0/Dockerfile +++ b/docker/2.0/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v2.0.0-rc2/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v2.0.0/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.4/Dockerfile b/docker/2.1/Dockerfile index 8dcea3927..7ecf64116 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/2.1.0-rc1/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 Binary files differnew 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 |