From c0e4b1e79715a096dd9aa827e7eda06a7bcc9e52 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 8 Oct 2015 16:10:27 -0400 Subject: [PATCH] Creating dockerfiles for release 1.1.0 --- docker/0.7/Dockerrun.aws.zip | Bin 867 -> 0 bytes docker/0.7/config_docker.json | 103 ------------------ docker/{0.7 => 1.1}/Dockerfile | 2 +- docker/1.1/Dockerrun.aws.zip | Bin 0 -> 710 bytes .../.ebextensions/01_files.config | 0 .../Dockerrun.aws/Dockerrun.aws.json | 2 +- docker/1.1/config_docker.json | 92 ++++++++++++++++ docker/{0.7 => 1.1}/docker-entry.sh | 0 8 files changed, 94 insertions(+), 105 deletions(-) delete mode 100644 docker/0.7/Dockerrun.aws.zip delete mode 100644 docker/0.7/config_docker.json rename docker/{0.7 => 1.1}/Dockerfile (93%) create mode 100644 docker/1.1/Dockerrun.aws.zip rename docker/{0.7 => 1.1}/Dockerrun.aws/.ebextensions/01_files.config (100%) rename docker/{0.7 => 1.1}/Dockerrun.aws/Dockerrun.aws.json (75%) create mode 100644 docker/1.1/config_docker.json rename docker/{0.7 => 1.1}/docker-entry.sh (100%) diff --git a/docker/0.7/Dockerrun.aws.zip b/docker/0.7/Dockerrun.aws.zip deleted file mode 100644 index bba04cca523a4669c29c01edbc49d5a52d340238..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 867 zcmWIWW@h1H0D;dA^6p>;l;C5KVbDuWO06hK%`48#&nwms4dG;9?s9$-3c{ro+zgB? zFPIq^SW^iInskl1<60J3F-{PiIcPbolzx#0|_o`cCs( zew??PP{ytis+ihsQx$iSYkqdS;mKWB*DtKP&k%DYkUjLWNqlbfTMhGNR~&^-?(XrN z_QUkDGeklDty5_G!-s`LPId46CUVUEKP?>e{&D)JU*=C8yJX69<46V8x z&3YC|+WwAt{Y78X-oD^sOLMx)zC#HmzwY*4TyalEhIfLktoTwEzc(?r9&#c=&K1C zAExbGtKl&5AXD1nf)6ipbgFy}=U>QX=~tR&yESQ+)KZmiu6FUuLcgp#E1hc6YR!F% z@8#o}5w|$xPX4j)OYnBwz%}jag{NBWEbO-DP3$KXhZdYVD}M9J6Q3)KJ~0P)Gcw6B z<4QjgK)-^30K;2H5RIOiSRtti&94wMait}QnZRVlu%yug!%U2n1+)T`vhY}e894|m h-Zn-7ZNe5+Ky$G~Q-C)s8_1)~K*$f&X~zWO0RXI77p(vQ diff --git a/docker/0.7/config_docker.json b/docker/0.7/config_docker.json deleted file mode 100644 index cbac2ea69c..0000000000 --- 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 similarity index 93% rename from docker/0.7/Dockerfile rename to docker/1.1/Dockerfile index 202d42dbc4..600d33308e 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 0000000000000000000000000000000000000000..945168a714b636ba64e27d5b5ca47a0bedd2ed00 GIT binary patch literal 710 zcmWIWW@Zs#U|`^2IN0Ffe*E&Wzte%dOF%5dAj9C2pPZdqR8*R$msnn`msOmf7aGFJ zz`W{=SlBKgF0J5ZU}Sm0%)r2s0@R_~vzzOXgMe%G!FrD9?rba1=gO@LN*z%hM;E*n zI`gjO&B+stOxu-8lRqS5qf`XPow+fmBnti6>Dvj3$-6iJo9p6gREPdmQ|4R z^w(283od;2`K(+O@4EiZzlNONdtGX$OSR6-S|yyL&vR{ct}u-Di$<#hU<)A4-3ZuKBBw_xkF6 z&Rfr(SD#llRAya#^L8Uowprpa&y+9|L#r-Fvz|qgw!dRuf6>>pw=cNZ(wwfc?@&U? zue-e$SKO14;hkVBE54M)?@i3DhnxZ4j7)OOxT0MG7&;6Lz~Etc+X!M|O9ZTtM1U3~ n$mU{(HNxB_jgNum5(s&q6<9(&z?+o~