Fixing docker files for 1.4 RC2

Этот коммит содержится в:
=Corey Hulen
2016-01-12 16:40:18 -06:00
родитель 6ce6115100
Коммит 837de1e0c8
4 изменённых файлов: 4 добавлений и 21 удалений

Просмотреть файл

@@ -34,7 +34,7 @@ VOLUME /var/lib/mysql
WORKDIR /mattermost WORKDIR /mattermost
# Copy over files # Copy over files
ADD https://github.com/mattermost/platform/releases/download/v1.4.0-rc1/mattermost.tar.gz / ADD https://github.com/mattermost/platform/releases/download/v1.4.0-rc2/mattermost.tar.gz /
RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz
ADD config_docker.json / ADD config_docker.json /
ADD docker-entry.sh / ADD docker-entry.sh /

Двоичные данные
docker/1.4/Dockerrun.aws.zip

Двоичный файл не отображается.

Просмотреть файл

@@ -1,7 +1,7 @@
{ {
"AWSEBDockerrunVersion": "1", "AWSEBDockerrunVersion": "1",
"Image": { "Image": {
"Name": "mattermost/platform:1.4rc2", "Name": "mattermost/platform:1.4",
"Update": "true" "Update": "true"
}, },
"Ports": [ "Ports": [

Просмотреть файл

@@ -10,12 +10,7 @@
"EnablePostUsernameOverride": false, "EnablePostUsernameOverride": false,
"EnablePostIconOverride": false, "EnablePostIconOverride": false,
"EnableTesting": false, "EnableTesting": false,
"EnableDeveloper": false, "EnableSecurityFixAlert": true
"EnableSecurityFixAlert": true,
"SessionLengthWebInDays" : 30,
"SessionLengthMobileInDays" : 30,
"SessionLengthSSOInDays" : 30,
"SessionCacheInMinutes" : 10
}, },
"TeamSettings": { "TeamSettings": {
"SiteName": "Mattermost", "SiteName": "Mattermost",
@@ -58,11 +53,7 @@
"AmazonS3AccessKeyId": "", "AmazonS3AccessKeyId": "",
"AmazonS3SecretAccessKey": "", "AmazonS3SecretAccessKey": "",
"AmazonS3Bucket": "", "AmazonS3Bucket": "",
"AmazonS3Region": "", "AmazonS3Region": ""
"AmazonS3Endpoint": "",
"AmazonS3BucketEndpoint": "",
"AmazonS3LocationConstraint": false,
"AmazonS3LowercaseBucket": false
}, },
"EmailSettings": { "EmailSettings": {
"EnableSignUpWithEmail": true, "EnableSignUpWithEmail": true,
@@ -91,14 +82,6 @@
"ShowEmailAddress": true, "ShowEmailAddress": true,
"ShowFullName": true "ShowFullName": true
}, },
"SupportSettings": {
"TermsOfServiceLink": "/static/help/terms.html",
"PrivacyPolicyLink": "/static/help/privacy.html",
"AboutLink": "/static/help/about.html",
"HelpLink": "/static/help/help.html",
"ReportAProblemLink": "/static/help/report_problem.html",
"SupportEmail": "feedback@mattermost.com"
},
"GitLabSettings": { "GitLabSettings": {
"Enable": false, "Enable": false,
"Secret": "", "Secret": "",