summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-10-08 16:10:27 -0400
committerChristopher Speller <crspeller@gmail.com>2015-10-08 16:16:53 -0400
commitc0e4b1e79715a096dd9aa827e7eda06a7bcc9e52 (patch)
tree82c504aa968d32e018cf234f795253c541b463bc /docker
parent5d4c0e318937b0eb6390452aec1db15022d3b6ae (diff)
downloadchat-c0e4b1e79715a096dd9aa827e7eda06a7bcc9e52.tar.gz
chat-c0e4b1e79715a096dd9aa827e7eda06a7bcc9e52.tar.bz2
chat-c0e4b1e79715a096dd9aa827e7eda06a7bcc9e52.zip
Creating dockerfiles for release 1.1.0
Diffstat (limited to 'docker')
-rw-r--r--docker/0.7/Dockerrun.aws.zipbin867 -> 0 bytes
-rw-r--r--docker/0.7/config_docker.json103
-rw-r--r--docker/1.1/Dockerfile (renamed from docker/0.7/Dockerfile)2
-rw-r--r--docker/1.1/Dockerrun.aws.zipbin0 -> 710 bytes
-rw-r--r--docker/1.1/Dockerrun.aws/.ebextensions/01_files.config (renamed from docker/0.7/Dockerrun.aws/.ebextensions/01_files.config)0
-rwxr-xr-xdocker/1.1/Dockerrun.aws/Dockerrun.aws.json (renamed from docker/0.7/Dockerrun.aws/Dockerrun.aws.json)2
-rw-r--r--docker/1.1/config_docker.json92
-rwxr-xr-xdocker/1.1/docker-entry.sh (renamed from docker/0.7/docker-entry.sh)0
8 files changed, 94 insertions, 105 deletions
diff --git a/docker/0.7/Dockerrun.aws.zip b/docker/0.7/Dockerrun.aws.zip
deleted file mode 100644
index bba04cca5..000000000
--- a/docker/0.7/Dockerrun.aws.zip
+++ /dev/null
Binary files differ
diff --git a/docker/0.7/config_docker.json b/docker/0.7/config_docker.json
deleted file mode 100644
index cbac2ea69..000000000
--- a/docker/0.7/config_docker.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
- "LogSettings": {
- "ConsoleEnable": true,
- "ConsoleLevel": "INFO",
- "FileEnable": true,
- "FileLevel": "INFO",
- "FileFormat": "",
- "FileLocation": ""
- },
- "ServiceSettings": {
- "SiteName": "Mattermost",
- "Mode" : "dev",
- "AllowTesting" : true,
- "UseSSL": false,
- "Port": "80",
- "Version": "developer",
- "Shards": {
- },
- "InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6",
- "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4",
- "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t",
- "AnalyticsUrl": "",
- "UseLocalStorage": true,
- "StorageDirectory": "/mattermost/data/",
- "AllowedLoginAttempts": 10,
- "DisableEmailSignUp": false
- },
- "SSOSettings": {
- "gitlab": {
- "Allow": false,
- "Secret" : "",
- "Id": "",
- "Scope": "",
- "AuthEndpoint": "",
- "TokenEndpoint": "",
- "UserApiEndpoint": ""
- }
- },
- "SqlSettings": {
- "DriverName": "mysql",
- "DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8",
- "DataSourceReplicas": ["mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8"],
- "MaxIdleConns": 10,
- "MaxOpenConns": 10,
- "Trace": false,
- "AtRestEncryptKey": "Ya0xMrybACJ3sZZVWQC7e31h5nSDWZFS"
- },
- "AWSSettings": {
- "S3AccessKeyId": "",
- "S3SecretAccessKey": "",
- "S3Bucket": "",
- "S3Region": ""
- },
- "ImageSettings": {
- "ThumbnailWidth": 120,
- "ThumbnailHeight": 100,
- "PreviewWidth": 1024,
- "PreviewHeight": 0,
- "ProfileWidth": 128,
- "ProfileHeight": 128,
- "InitialFont": "luximbi.ttf"
- },
- "EmailSettings": {
- "ByPassEmail" : true,
- "SMTPUsername": "",
- "SMTPPassword": "",
- "SMTPServer": "",
- "UseTLS": false,
- "UseStartTLS": false,
- "FeedbackEmail": "",
- "FeedbackName": "",
- "ApplePushServer": "",
- "ApplePushCertPublic": "",
- "ApplePushCertPrivate": ""
- },
- "RateLimitSettings": {
- "UseRateLimiter": true,
- "PerSec": 10,
- "MemoryStoreSize": 10000,
- "VaryByRemoteAddr": true,
- "VaryByHeader": ""
- },
- "PrivacySettings": {
- "ShowEmailAddress": true,
- "ShowPhoneNumber": true,
- "ShowSkypeId": true,
- "ShowFullName": true
- },
- "TeamSettings": {
- "MaxUsersPerTeam": 150,
- "AllowPublicLink": true,
- "AllowValetDefault": false,
- "TermsLink": "/static/help/configure_links.html",
- "PrivacyLink": "/static/help/configure_links.html",
- "AboutLink": "/static/help/configure_links.html",
- "HelpLink": "/static/help/configure_links.html",
- "ReportProblemLink": "/static/help/configure_links.html",
- "TourLink": "/static/help/configure_links.html",
- "DefaultThemeColor": "#2389D7",
- "DisableTeamCreation": false,
- "RestrictCreationToDomains": ""
- }
-}
diff --git a/docker/0.7/Dockerfile b/docker/1.1/Dockerfile
index 202d42dbc..600d33308 100644
--- a/docker/0.7/Dockerfile
+++ b/docker/1.1/Dockerfile
@@ -34,7 +34,7 @@ VOLUME /var/lib/mysql
WORKDIR /mattermost
# Copy over files
-ADD https://github.com/mattermost/platform/releases/download/v0.7.1/mattermost.tar.gz /
+ADD https://github.com/mattermost/platform/releases/download/v1.1.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.1/Dockerrun.aws.zip b/docker/1.1/Dockerrun.aws.zip
new file mode 100644
index 000000000..945168a71
--- /dev/null
+++ b/docker/1.1/Dockerrun.aws.zip
Binary files differ
diff --git a/docker/0.7/Dockerrun.aws/.ebextensions/01_files.config b/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config
index 7f40a8b34..7f40a8b34 100644
--- a/docker/0.7/Dockerrun.aws/.ebextensions/01_files.config
+++ b/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config
diff --git a/docker/0.7/Dockerrun.aws/Dockerrun.aws.json b/docker/1.1/Dockerrun.aws/Dockerrun.aws.json
index b53ec235c..042e79bd3 100755
--- a/docker/0.7/Dockerrun.aws/Dockerrun.aws.json
+++ b/docker/1.1/Dockerrun.aws/Dockerrun.aws.json
@@ -1,7 +1,7 @@
{
"AWSEBDockerrunVersion": "1",
"Image": {
- "Name": "mattermost/platform:0.7",
+ "Name": "mattermost/platform:1.1",
"Update": "true"
},
"Ports": [
diff --git a/docker/1.1/config_docker.json b/docker/1.1/config_docker.json
new file mode 100644
index 000000000..ab5b0a7be
--- /dev/null
+++ b/docker/1.1/config_docker.json
@@ -0,0 +1,92 @@
+{
+ "ServiceSettings": {
+ "ListenAddress": ":80",
+ "MaximumLoginAttempts": 10,
+ "SegmentDeveloperKey": "",
+ "GoogleDeveloperKey": "",
+ "EnableOAuthServiceProvider": false,
+ "EnableIncomingWebhooks": true,
+ "EnablePostUsernameOverride": false,
+ "EnablePostIconOverride": false,
+ "EnableTesting": false
+ },
+ "TeamSettings": {
+ "SiteName": "Mattermost",
+ "MaxUsersPerTeam": 50,
+ "EnableTeamCreation": true,
+ "EnableUserCreation": true,
+ "RestrictCreationToDomains": ""
+ },
+ "SqlSettings": {
+ "DriverName": "mysql",
+ "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8",
+ "DataSourceReplicas": [],
+ "MaxIdleConns": 10,
+ "MaxOpenConns": 10,
+ "Trace": false,
+ "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QVg"
+ },
+ "LogSettings": {
+ "EnableConsole": false,
+ "ConsoleLevel": "INFO",
+ "EnableFile": true,
+ "FileLevel": "INFO",
+ "FileFormat": "",
+ "FileLocation": ""
+ },
+ "FileSettings": {
+ "DriverName": "local",
+ "Directory": "/mattermost/data/",
+ "EnablePublicLink": true,
+ "PublicLinkSalt": "A705AklYF8MFDOfcwh3I488G8vtLlVip",
+ "ThumbnailWidth": 120,
+ "ThumbnailHeight": 100,
+ "PreviewWidth": 1024,
+ "PreviewHeight": 0,
+ "ProfileWidth": 128,
+ "ProfileHeight": 128,
+ "InitialFont": "luximbi.ttf",
+ "AmazonS3AccessKeyId": "",
+ "AmazonS3SecretAccessKey": "",
+ "AmazonS3Bucket": "",
+ "AmazonS3Region": ""
+ },
+ "EmailSettings": {
+ "EnableSignUpWithEmail": true,
+ "SendEmailNotifications": false,
+ "RequireEmailVerification": false,
+ "FeedbackName": "",
+ "FeedbackEmail": "",
+ "SMTPUsername": "",
+ "SMTPPassword": "",
+ "SMTPServer": "",
+ "SMTPPort": "",
+ "ConnectionSecurity": "",
+ "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS",
+ "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL",
+ "ApplePushServer": "",
+ "ApplePushCertPublic": "",
+ "ApplePushCertPrivate": ""
+ },
+ "RateLimitSettings": {
+ "EnableRateLimiter": true,
+ "PerSec": 10,
+ "MemoryStoreSize": 10000,
+ "VaryByRemoteAddr": true,
+ "VaryByHeader": ""
+ },
+ "PrivacySettings": {
+ "ShowEmailAddress": true,
+ "ShowFullName": true,
+ "EnableSecurityFixAlert": true
+ },
+ "GitLabSettings": {
+ "Enable": false,
+ "Secret": "",
+ "Id": "",
+ "Scope": "",
+ "AuthEndpoint": "",
+ "TokenEndpoint": "",
+ "UserApiEndpoint": ""
+ }
+}
diff --git a/docker/0.7/docker-entry.sh b/docker/1.1/docker-entry.sh
index 6bd2a1263..6bd2a1263 100755
--- a/docker/0.7/docker-entry.sh
+++ b/docker/1.1/docker-entry.sh