diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-10-12 12:06:55 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-10-12 12:06:55 -0400 |
commit | 4949b6837f1a2ef103f58659c7692f01378128f7 (patch) | |
tree | 5d53313029624492c15888345167a4146d1ea918 /docker/1.1/Dockerrun.aws | |
parent | 6aff5900f79721783599a7ab9fe29074e4050544 (diff) | |
parent | f55416d9f45afcb310246426366cd261f138029f (diff) | |
download | chat-4949b6837f1a2ef103f58659c7692f01378128f7.tar.gz chat-4949b6837f1a2ef103f58659c7692f01378128f7.tar.bz2 chat-4949b6837f1a2ef103f58659c7692f01378128f7.zip |
Merge branch 'master' into typos
Diffstat (limited to 'docker/1.1/Dockerrun.aws')
-rw-r--r-- | docker/1.1/Dockerrun.aws/.ebextensions/01_files.config | 14 | ||||
-rwxr-xr-x | docker/1.1/Dockerrun.aws/Dockerrun.aws.json | 13 |
2 files changed, 27 insertions, 0 deletions
diff --git a/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config b/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config new file mode 100644 index 000000000..7f40a8b34 --- /dev/null +++ b/docker/1.1/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/1.1/Dockerrun.aws/Dockerrun.aws.json b/docker/1.1/Dockerrun.aws/Dockerrun.aws.json new file mode 100755 index 000000000..042e79bd3 --- /dev/null +++ b/docker/1.1/Dockerrun.aws/Dockerrun.aws.json @@ -0,0 +1,13 @@ +{
+ "AWSEBDockerrunVersion": "1",
+ "Image": {
+ "Name": "mattermost/platform:1.1",
+ "Update": "true"
+ },
+ "Ports": [
+ {
+ "ContainerPort": "80"
+ }
+ ],
+ "Logging": "/var/log/"
+}
|