summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-08-24 09:58:45 -0700
committer=Corey Hulen <corey@hulen.com>2015-08-24 09:58:45 -0700
commit677b7393b5e5fc5d1598e820d1ee78c2b0727e60 (patch)
tree0d39e1e54e83b8bc559ec59be6fee90a3022b9f9 /docker
parent06c5ddcb1d9e4e2e79b33196a58c5d62c0c43e37 (diff)
downloadchat-677b7393b5e5fc5d1598e820d1ee78c2b0727e60.tar.gz
chat-677b7393b5e5fc5d1598e820d1ee78c2b0727e60.tar.bz2
chat-677b7393b5e5fc5d1598e820d1ee78c2b0727e60.zip
Fixes mm-1960 allows upload of files over 1MB to Elastic Beanstalk
Diffstat (limited to 'docker')
-rw-r--r--docker/0.6/Dockerrun.aws.zipbin0 -> 867 bytes
-rw-r--r--docker/0.6/Dockerrun.aws/.ebextensions/01_files.config14
-rwxr-xr-xdocker/0.6/Dockerrun.aws/Dockerrun.aws.json (renamed from docker/0.6/Dockerrun.aws.json)0
-rw-r--r--docker/dev/Dockerrun.aws.zipbin0 -> 866 bytes
-rw-r--r--docker/dev/Dockerrun.aws/.ebextensions/01_files.config14
-rwxr-xr-xdocker/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
new file mode 100644
index 000000000..342c1549a
--- /dev/null
+++ b/docker/0.6/Dockerrun.aws.zip
Binary files differ
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
new file mode 100644
index 000000000..722072d69
--- /dev/null
+++ b/docker/dev/Dockerrun.aws.zip
Binary files differ
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