From 89bc1212b3db591d509a8f69464a360fc4feda67 Mon Sep 17 00:00:00 2001
From: Delio Castillo <jangeador@gmail.com>
Date: Fri, 12 May 2017 09:23:22 -0700
Subject: [PATCH] Fixes docker file when using letsencrypt. Adds ps command to
 nginx image for start.sh to be able to run without errors (#1154)

---
 {{cookiecutter.project_slug}}/compose/nginx/Dockerfile | 3 +++
 {{cookiecutter.project_slug}}/docker-compose.yml       | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/nginx/Dockerfile b/{{cookiecutter.project_slug}}/compose/nginx/Dockerfile
index 7ab10d4d..25b48cd9 100644
--- a/{{cookiecutter.project_slug}}/compose/nginx/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/nginx/Dockerfile
@@ -2,6 +2,9 @@ FROM nginx:latest
 ADD nginx.conf /etc/nginx/nginx.conf
 
 {% if cookiecutter.use_lets_encrypt == 'y' and cookiecutter.use_docker == 'y' %}
+# installs the `ps` command in the nginx image
+RUN apt-get update && apt-get install -y procps
+
 ADD start.sh /start.sh
 ADD nginx-secure.conf /etc/nginx/nginx-secure.conf
 ADD dhparams.pem /etc/ssl/private/dhparams.pem
diff --git a/{{cookiecutter.project_slug}}/docker-compose.yml b/{{cookiecutter.project_slug}}/docker-compose.yml
index b586cbf3..5c81ad98 100644
--- a/{{cookiecutter.project_slug}}/docker-compose.yml
+++ b/{{cookiecutter.project_slug}}/docker-compose.yml
@@ -28,14 +28,12 @@ services:
       - django
 {% if cookiecutter.use_lets_encrypt == 'y' %}
       - certbot
+    environment:
+      - MY_DOMAIN_NAME={{ cookiecutter.domain_name }}
 {% endif %}
     ports:
       - "0.0.0.0:80:80"
 {% if cookiecutter.use_lets_encrypt == 'y' %}
-    environment:
-      - MY_DOMAIN_NAME={{ cookiecutter.domain_name }}
-    ports:
-      - "0.0.0.0:80:80"
       - "0.0.0.0:443:443"
     volumes:
       - /etc/letsencrypt:/etc/letsencrypt