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