From 677b7393b5e5fc5d1598e820d1ee78c2b0727e60 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 24 Aug 2015 09:58:45 -0700
Subject: [PATCH] Fixes mm-1960 allows upload of files over 1MB to Elastic
 Beanstalk

---
 README.md                                         |   4 ++--
 docker/0.6/Dockerrun.aws.zip                      | Bin 0 -> 867 bytes
 .../Dockerrun.aws/.ebextensions/01_files.config   |  14 ++++++++++++++
 docker/0.6/{ => Dockerrun.aws}/Dockerrun.aws.json |   0
 docker/dev/Dockerrun.aws.zip                      | Bin 0 -> 866 bytes
 .../Dockerrun.aws/.ebextensions/01_files.config   |  14 ++++++++++++++
 docker/dev/{ => Dockerrun.aws}/Dockerrun.aws.json |   0
 7 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 docker/0.6/Dockerrun.aws.zip
 create mode 100644 docker/0.6/Dockerrun.aws/.ebextensions/01_files.config
 rename docker/0.6/{ => Dockerrun.aws}/Dockerrun.aws.json (100%)
 create mode 100644 docker/dev/Dockerrun.aws.zip
 create mode 100644 docker/dev/Dockerrun.aws/.ebextensions/01_files.config
 rename docker/dev/{ => Dockerrun.aws}/Dockerrun.aws.json (100%)

diff --git a/README.md b/README.md
index c4276ed78a..e22d3312b4 100644
--- a/README.md
+++ b/README.md
@@ -103,14 +103,14 @@ Local Machine Setup (Docker)
 AWS Elastic Beanstalk Setup (Docker)
 ------------------------------------
 
-1. Create a new elastic beanstalk docker application using the [Dockerrun.aws.json](docker/0.6/Dockerrun.aws.json) file provided. 
+1. Create a new elastic beanstalk docker application using the [Dockerrun.aws.zip](docker/0.6/Dockerrun.aws//Dockerrun.aws.zip) file provided. 
 	1. From the AWS console select Elastic Beanstalk.
 	2. Select "Create New Application" from the top right.
 	3. Name the application and press next.
 	4. Select "Create a web server" environment.
 	5. If asked, select create an IAM role and instance profile and press next.
 	6. For predefined configuration select under Generic: Docker. For environment type select single instance.
-	7. For application source, select upload your own and upload Dockerrun.aws.json from [docker/0.6/Dockerrun.aws.json](docker/0.6/Dockerrun.aws.json). Everything else may be left at default.
+	7. For application source, select upload your own and upload Dockerrun.aws.zip from [Dockerrun.aws.zip](docker/0.6/Dockerrun.aws//Dockerrun.aws.zip). Everything else may be left at default.
 	8. Select an environment name, this is how you will refer to your environment. Make sure the URL is available then press next.
 	9. The options on the additional resources page may be left at default unless you wish to change them. Press Next.
 	10. On the configuration details place. Select an instance type of t2.small or larger.
diff --git a/docker/0.6/Dockerrun.aws.zip b/docker/0.6/Dockerrun.aws.zip
new file mode 100644
index 0000000000000000000000000000000000000000..342c1549a6edd0e4b24586835f7e44c82103d51b
GIT binary patch
literal 867
zcmWIWW@h1H0D-rD67FCIl;C5KVbDuWO06hK%`48#&nwms4dG;9uJyScdKHLEE4UdL
zS-vtdFtCUKbp!y-0nr>_bNGCHj_d~VqJh$~80Hul#;0ZGq!#NX=jWwmro)ZhhiUBA
zbAefh4S3ide4poZdY*KvlSE4T4auhD)t#N%lBY8#Upjn!Y2pTEAAP6!EkDlNO(<j6
z2vtn&wyBD{$TdH^-SFhDtLqn5-Dik7638BU*(5$U`mKifvMY{4CwKRFPW$10YP!!H
z>xwr48b6f&9$oWSA@B9o`<%C)J+D5mY^cn-_~z|Ko@}$kW1cBtCWcmBj%GcJByE4k
zy#AuEX>VU}v86d(W#6HMl3#awFRr*JBf~qvR#to|i{G1=TMs!AA!6*n=e}QWm-!4}
zh+G0<Az+BO<R@pR78RA|=_QsI>tz+^=YfOa64SZR<Cwvq+q0YNkb{70^}%|M;BIN@
zi6#5E99;yq3UoV~dmHQ)Rui5*p}t%_+w@NLxw&;#CygTR>;FF67bk!EPV4Na+ZHjn
zvT@JoJ#=vK=8Z2*kJdP?7qsb$_;#f$Gi%DE8{$7}W`<qdZI(afqR2a)4C^KR=}DQ&
z6)K<qTQupi9@L5mbDq9hMo8w1&E-EH=Ryx^n#ZREPc{zhKE)s4&B!Fjj4S;}0R0LA
z0t{~*K{R@5Vuhq8jFbd26IWV-m<dc)3`-h4FwDeAS%j^?j2wg&ZyTe4Herh@pt+!^
V!f-k(8_1)~K*$f&X~zWO0RZj|53B$H

literal 0
HcmV?d00001

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 0000000000..7f40a8b34f
--- /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
similarity index 100%
rename from docker/0.6/Dockerrun.aws.json
rename to 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 0000000000000000000000000000000000000000..722072d69ddc2d71b3523582e4c978c09dcb1f48
GIT binary patch
literal 866
zcmWIWW@h1H0D;<eQFkx{O7JnrFzBTwrB;-r<`rk==N0RRhHx@4*X_O@8s~94w6ubo
zfsy4aBLf4A2vA1=&>RrW0XB!v*XPJ?ATJsyEsJ4}fnj`FW=?9cUUGh3T4p-jSbI!k
zx1I~kI&8qh_Tc+Gr_=MKTb(3Q(r-vMC9m%6)RsJ*Ir-Az>q`?iF#G5`&2RZ}-flt}
zyGE#DYPU^Q+(oYW+3kiWcU@h-u<AZT%#lF$(90(AxzTSm%$Hqp6gs)P$8*{b_fyk-
z=2%y}3DEeV^!MnRzY2M;uiodp_3U}|d1XUo*2On(H}YhgB_8uk2{SRY>T)#eStM!u
zJLdHleNB7&f{QK9=_>mUC6xTS+k0`vJsBC^3AVE0OIiHh#N2wwi3ky62R`?gRu)pz
zfgy4Uh=qV5;*y`7omx~>nx~goUaXf@oSz2{hD%K6Li-P1M-N@yp50uB90Xje57u);
zbFZGe<Z~#8Qqzjo2%fZ<rkisOtUZN4y+4<>wypa7PUAD_u8C&-uM>AK|1LgrcY%AK
zDQmD;TB_LOf-esOx)oK=rhm|s;#WE`Z_$lyj6Vf_Z#rbR{>tvHq9;<g$}@tjpY@9;
zb#l$S`NuwN!(xR1_9rPzo>pZV$y}~{`m=M+>Spgd-wte3Ob-oy${yg&$Rx*%EBQzO
zy$S*X3~wDlG<srUg(N17gak4ZS5ktQ2~1TCOBy{e%*04ogss4g8-x{a8>4_WVT&oC
YxuBTBa5^g+$fL|a$Pd(M%LL*908v>I#Q*>R

literal 0
HcmV?d00001

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 0000000000..7f40a8b34f
--- /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
similarity index 100%
rename from docker/dev/Dockerrun.aws.json
rename to docker/dev/Dockerrun.aws/Dockerrun.aws.json