Merge pull request #361 from pydanny/multiple-dockerfiles

Multiple Dockerfiles. Implementation of #360.

{{cookiecutter.repo_name}}/Dockerfile

@@ -7,10 +7,8 @@ ENV PYTHONUNBUFFERED 1
 
 # Requirements have to be pulled and installed here, otherwise caching won't work
 ADD ./requirements /requirements
-ADD ./requirements.txt /requirements.txt
 
-RUN pip install -r /requirements.txt
-RUN pip install -r /requirements/local.txt
+RUN pip install -r /requirements/production.txt
 
 RUN groupadd -r django && useradd -r -g django django
 ADD . /app

{{cookiecutter.repo_name}}/Dockerfile-dev

@@ -0,0 +1,25 @@
+{% if cookiecutter.use_python2 == 'n' -%}
+FROM python:3.5
+{% else %}
+FROM python:2.7
+{%- endif %}
+ENV PYTHONUNBUFFERED 1
+
+# Requirements have to be pulled and installed here, otherwise caching won't work
+ADD ./requirements /requirements
+
+RUN pip install -r /requirements/local.txt
+
+RUN groupadd -r django && useradd -r -g django django
+ADD . /app
+RUN chown -R django /app
+
+ADD ./compose/django/gunicorn.sh /gunicorn.sh
+ADD ./compose/django/entrypoint.sh /entrypoint.sh
+
+RUN chmod +x /entrypoint.sh && chown django /entrypoint.sh
+RUN chmod +x /gunicorn.sh && chown django /gunicorn.sh
+
+WORKDIR /app
+
+ENTRYPOINT ["/entrypoint.sh"]

{{cookiecutter.repo_name}}/dev.yml

@@ -1,3 +1,4 @@
+
 postgres:
   image: postgres
   volumes:
@@ -6,6 +7,7 @@ postgres:
     - /data/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data
 
 django:
+  dockerfile: Dockerfile-dev
   build: .
   command: python /app/manage.py runserver_plus 0.0.0.0:8000
   volumes: