From 58f41fc97f9fc1ebf6853c7855a9450d9c92e8f1 Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Mon, 21 Oct 2019 09:59:37 +0200
Subject: [PATCH 1/2] fix: remove the aws Dockerfile and remove the awscli
 definition from production.yml when not selected

---
 hooks/post_gen_project.py                    | 7 +++++++
 {{cookiecutter.project_slug}}/production.yml | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index ff84f180..95815564 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -279,6 +279,10 @@ def remove_node_dockerfile():
     shutil.rmtree(os.path.join("compose", "local", "node"))
 
 
+def remove_aws_dockerfile():
+    shutil.rmtree(os.path.join("compose", "production", "aws"))
+
+
 def main():
     debug = "{{ cookiecutter.debug }}".lower() == "y"
 
@@ -302,6 +306,9 @@ def main():
     else:
         remove_docker_files()
 
+    if "{{ cookiecutter.use_docker }}".lower() == "y" and "{{ cookiecutter.cloud_provider}}".lower() != 'aws':
+        remove_aws_dockerfile()
+
     if "{{ cookiecutter.use_heroku }}".lower() == "n":
         remove_heroku_files()
 
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 331cbba6..62ec9d82 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -65,6 +65,8 @@ services:
     command: /start-flower
 
   {%- endif %}
+
+  {% if cookiecutter.cloud_provider == 'AWS' %}
   awscli:
     build:
       context: .
@@ -73,3 +75,4 @@ services:
       - ./.envs/.production/.django
     volumes:
       - production_postgres_data_backups:/backups
+  {%- endif %}

From eb8ea447e488df634373e44de36e4aad7fd2dfb3 Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Mon, 21 Oct 2019 11:12:53 +0200
Subject: [PATCH 2/2] fix: black

---
 hooks/post_gen_project.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 95815564..0544f14b 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -306,7 +306,10 @@ def main():
     else:
         remove_docker_files()
 
-    if "{{ cookiecutter.use_docker }}".lower() == "y" and "{{ cookiecutter.cloud_provider}}".lower() != 'aws':
+    if (
+        "{{ cookiecutter.use_docker }}".lower() == "y"
+        and "{{ cookiecutter.cloud_provider}}".lower() != "aws"
+    ):
         remove_aws_dockerfile()
 
     if "{{ cookiecutter.use_heroku }}".lower() == "n":