diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-30 15:38:15 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-30 15:38:15 -0400 |
| commit | 2d3ddfd467036935bc983cd77b4ab1243ac58cb6 (patch) | |
| tree | ed74e719e3d14857808a2dae5c5a08ebc35ed18d /docker | |
| parent | 46f86e7076a1dec6717a959299a08289a5cc54ac (diff) | |
| parent | ad92a90b02fdcea3846376747cedf8c81e5a2d22 (diff) | |
| download | chat-2d3ddfd467036935bc983cd77b4ab1243ac58cb6.tar.gz chat-2d3ddfd467036935bc983cd77b4ab1243ac58cb6.tar.bz2 chat-2d3ddfd467036935bc983cd77b4ab1243ac58cb6.zip | |
Merge release branch 'release-1.0.0'
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/1.0/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/1.0/config_docker.json | 8 | ||||
| -rw-r--r-- | docker/dev/config_docker.json | 8 | ||||
| -rw-r--r-- | docker/local/config_docker.json | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/docker/1.0/Dockerfile b/docker/1.0/Dockerfile index 3d7c36f31..8eeef8fb7 100644 --- a/docker/1.0/Dockerfile +++ b/docker/1.0/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v1.0.0-rc1/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v1.0.0-rc2/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.0/config_docker.json b/docker/1.0/config_docker.json index 06fee9bd5..806071376 100644 --- a/docker/1.0/config_docker.json +++ b/docker/1.0/config_docker.json @@ -22,7 +22,7 @@ "MaxIdleConns": 10, "MaxOpenConns": 10, "Trace": false, - "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV" + "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QVg" }, "LogSettings": { "EnableConsole": false, @@ -36,7 +36,7 @@ "DriverName": "local", "Directory": "/mattermost/data/", "EnablePublicLink": true, - "PublicLinkSalt": "LhaAWC6lYEKHTkBKsvyXNIOfUIT37AX", + "PublicLinkSalt": "A705AklYF8MFDOfcwh3I488G8vtLlVip", "ThumbnailWidth": 120, "ThumbnailHeight": 100, "PreviewWidth": 1024, @@ -60,8 +60,8 @@ "SMTPServer": "", "SMTPPort": "", "ConnectionSecurity": "", - "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo", - "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5e", + "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS", + "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL", "ApplePushServer": "", "ApplePushCertPublic": "", "ApplePushCertPrivate": "" diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index 0001eeb0a..733267f74 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -22,7 +22,7 @@ "MaxIdleConns": 10, "MaxOpenConns": 10, "Trace": false, - "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV" + "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QVg" }, "LogSettings": { "EnableConsole": false, @@ -36,7 +36,7 @@ "DriverName": "local", "Directory": "/mattermost/data/", "EnablePublicLink": true, - "PublicLinkSalt": "LhaAWC6lYEKHTkBKsvyXNIOfUIT37AX", + "PublicLinkSalt": "A705AklYF8MFDOfcwh3I488G8vtLlVip", "ThumbnailWidth": 120, "ThumbnailHeight": 100, "PreviewWidth": 1024, @@ -60,8 +60,8 @@ "SMTPServer": "", "SMTPPort": "", "ConnectionSecurity": "", - "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo", - "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5e", + "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS", + "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL", "ApplePushServer": "", "ApplePushCertPublic": "", "ApplePushCertPrivate": "" diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index 0001eeb0a..733267f74 100644 --- a/docker/local/config_docker.json +++ b/docker/local/config_docker.json @@ -22,7 +22,7 @@ "MaxIdleConns": 10, "MaxOpenConns": 10, "Trace": false, - "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV" + "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QVg" }, "LogSettings": { "EnableConsole": false, @@ -36,7 +36,7 @@ "DriverName": "local", "Directory": "/mattermost/data/", "EnablePublicLink": true, - "PublicLinkSalt": "LhaAWC6lYEKHTkBKsvyXNIOfUIT37AX", + "PublicLinkSalt": "A705AklYF8MFDOfcwh3I488G8vtLlVip", "ThumbnailWidth": 120, "ThumbnailHeight": 100, "PreviewWidth": 1024, @@ -60,8 +60,8 @@ "SMTPServer": "", "SMTPPort": "", "ConnectionSecurity": "", - "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo", - "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5e", + "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS", + "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL", "ApplePushServer": "", "ApplePushCertPublic": "", "ApplePushCertPrivate": "" |