diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-08-25 08:55:29 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-25 08:55:29 -0400 |
| commit | 70da0dbec6ed35cfc3196d50db4209378549fd92 (patch) | |
| tree | 072db05c1c70a19e953efbd9a9b87fd19b23e3f7 /docker | |
| parent | e8731133d23f613d8893842d3c55942b501680c0 (diff) | |
| parent | 8519eb3f493ea59f071fdb018943aeb192e21224 (diff) | |
| download | chat-70da0dbec6ed35cfc3196d50db4209378549fd92.tar.gz chat-70da0dbec6ed35cfc3196d50db4209378549fd92.tar.bz2 chat-70da0dbec6ed35cfc3196d50db4209378549fd92.zip | |
Merge pull request #456 from mattermost/mm-1960
Fixes mm-1960 allows upload of files over 1MB to Elastic Beanstalk
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/0.6/Dockerrun.aws.zip | bin | 0 -> 867 bytes | |||
| -rw-r--r-- | docker/0.6/Dockerrun.aws/.ebextensions/01_files.config | 14 | ||||
| -rwxr-xr-x | docker/0.6/Dockerrun.aws/Dockerrun.aws.json (renamed from docker/0.6/Dockerrun.aws.json) | 0 | ||||
| -rw-r--r-- | docker/dev/Dockerrun.aws.zip | bin | 0 -> 866 bytes | |||
| -rw-r--r-- | docker/dev/Dockerrun.aws/.ebextensions/01_files.config | 14 | ||||
| -rwxr-xr-x | docker/dev/Dockerrun.aws/Dockerrun.aws.json (renamed from docker/dev/Dockerrun.aws.json) | 0 |
6 files changed, 28 insertions, 0 deletions
diff --git a/docker/0.6/Dockerrun.aws.zip b/docker/0.6/Dockerrun.aws.zip Binary files differnew file mode 100644 index 000000000..342c1549a --- /dev/null +++ b/docker/0.6/Dockerrun.aws.zip diff --git a/docker/0.6/Dockerrun.aws/.ebextensions/01_files.config b/docker/0.6/Dockerrun.aws/.ebextensions/01_files.config new file mode 100644 index 000000000..7f40a8b34 --- /dev/null +++ b/docker/0.6/Dockerrun.aws/.ebextensions/01_files.config @@ -0,0 +1,14 @@ +files: + "/etc/nginx/conf.d/proxy.conf": + mode: "000755" + owner: root + group: root + content: | + client_max_body_size 50M; + "/opt/elasticbeanstalk/hooks/appdeploy/post/init.sh": + mode: "000755" + owner: root + group: root + content: | + #!/usr/bin/env bash + gpasswd -a ec2-user docker diff --git a/docker/0.6/Dockerrun.aws.json b/docker/0.6/Dockerrun.aws/Dockerrun.aws.json index f6f7cf726..f6f7cf726 100755 --- a/docker/0.6/Dockerrun.aws.json +++ b/docker/0.6/Dockerrun.aws/Dockerrun.aws.json diff --git a/docker/dev/Dockerrun.aws.zip b/docker/dev/Dockerrun.aws.zip Binary files differnew file mode 100644 index 000000000..722072d69 --- /dev/null +++ b/docker/dev/Dockerrun.aws.zip diff --git a/docker/dev/Dockerrun.aws/.ebextensions/01_files.config b/docker/dev/Dockerrun.aws/.ebextensions/01_files.config new file mode 100644 index 000000000..7f40a8b34 --- /dev/null +++ b/docker/dev/Dockerrun.aws/.ebextensions/01_files.config @@ -0,0 +1,14 @@ +files: + "/etc/nginx/conf.d/proxy.conf": + mode: "000755" + owner: root + group: root + content: | + client_max_body_size 50M; + "/opt/elasticbeanstalk/hooks/appdeploy/post/init.sh": + mode: "000755" + owner: root + group: root + content: | + #!/usr/bin/env bash + gpasswd -a ec2-user docker diff --git a/docker/dev/Dockerrun.aws.json b/docker/dev/Dockerrun.aws/Dockerrun.aws.json index ae847ef80..ae847ef80 100755 --- a/docker/dev/Dockerrun.aws.json +++ b/docker/dev/Dockerrun.aws/Dockerrun.aws.json |