Multiple Dockerfiles. Implementation of #360.

This commit is contained in:
Audrey Roy Greenfeld 2015-10-03 20:06:33 -07:00
parent 4781c2baa2
commit e23e9ceb7e
3 changed files with 29 additions and 4 deletions

View File

@ -6,11 +6,9 @@ FROM python:2.7
ENV PYTHONUNBUFFERED 1
# Requirements have to be pulled and installed here, otherwise caching won't work
ADD ./requirements /requirements
ADD ./requirements.txt /requirements.txt
ADD ./requirements/production.txt /requirements/production.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

View File

@ -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/local.txt /requirements/local.txt
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"]

View File

@ -1,3 +1,5 @@
dockerfile: Dockerfile-dev
postgres:
image: postgres
volumes: