diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-16 11:38:25 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-16 11:38:25 -0500 |
| commit | 48d2f86b90b3e0b02cb28f3e8b6e4d454f9cb869 (patch) | |
| tree | 7ba35bc8353d5398934bb73692ec40ee47a81404 /docker | |
| parent | d03b3830976c96aab59cb78177cfd0e82cc05b8d (diff) | |
| parent | 49a459d696fc8fee0b508990fca571fb8d2f2654 (diff) | |
| download | chat-48d2f86b90b3e0b02cb28f3e8b6e4d454f9cb869.tar.gz chat-48d2f86b90b3e0b02cb28f3e8b6e4d454f9cb869.tar.bz2 chat-48d2f86b90b3e0b02cb28f3e8b6e4d454f9cb869.zip | |
Merge release branch 'release-1.2'
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/1.2/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/1.2/config_docker.json | 4 | ||||
| -rw-r--r-- | docker/dev/config_docker.json | 4 | ||||
| -rw-r--r-- | docker/local/config_docker.json | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/docker/1.2/Dockerfile b/docker/1.2/Dockerfile index cb2b58f53..e00c4e5ca 100644 --- a/docker/1.2/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.2.0/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v1.2.1/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/config_docker.json b/docker/1.2/config_docker.json index 80e6ab14e..c23a72cd1 100644 --- a/docker/1.2/config_docker.json +++ b/docker/1.2/config_docker.json @@ -5,8 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, - "EnableOutgoingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index 80e6ab14e..c23a72cd1 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -5,8 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, - "EnableOutgoingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index 80e6ab14e..c23a72cd1 100644 --- a/docker/local/config_docker.json +++ b/docker/local/config_docker.json @@ -5,8 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, - "EnableOutgoingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, |