Merge branch 'release/1.14.0'

Author: fabfuel

README.rst

@@ -258,6 +258,22 @@ Instead of setting environment variables separately, you can pass a .env file pe
 
     $ ecs deploy my-cluster my-service --s3-env-file my-app arn:aws:s3:::my-ecs-environment/my-app.env
 
+Set secrets via .env files
+==============================
+Instead of setting secrets separately, you can pass a .env file per container to set all secrets at once.
+
+This will expect an env file format, but any values will be set as the `valueFrom` parameter in the secrets config.
+This value can be either the path or the full ARN of a secret in the AWS Parameter Store. For example, with a secrets.env
+file like the following:
+
+```
+SOME_SECRET=arn:aws:ssm:<aws region>:<aws account id>:parameter/KEY_OF_SECRET_IN_PARAMETER_STORE
+```
+
+$ ecs deploy my-cluster my-service --secret-env-file webserver env/secrets.env
+
+This will modify the **webserver** container definition and add or overwrite the environment variable `SOME_SECRET` with the value of the `KEY_OF_SECRET_IN_PARAMETER_STORE` in the AWS Parameter Store of the AWS Systems Manager.
+
 
 Set a docker label
 ===================
@@ -422,6 +438,21 @@ This instructs ecs-deploy to wait for ECS to finish the deployment for the given
 
 To run a deployment without waiting for the successful or failed result at all, set ``--timeout`` to the value of ``-1``.
 
+
+Multi-Account Setup
+===================
+If you manage different environments of your system in multiple differnt AWS accounts, you can now easily assume a
+deployment role in the target account in which your ECS cluster is running. You only need to provide ``--account``
+with the AWS account id and ``--assume-role`` with the name of the role you want to assume in the target account.
+ecs-deploy automatically assumes this role and deploys inside your target account:
+
+Example::
+
+    $ ecs deploy my-cluster my-service --account 1234567890 --assume-role ecsDeployRole
+
+
+
+
 Scaling
 -------
 

ecs_deploy/__init__.py

@@ -1 +1 @@
-VERSION = '1.13.1'
+VERSION = '1.14.0'