mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-11-29 21:14:03 +03:00
Merge pull request #361 from pydanny/multiple-dockerfiles
Multiple Dockerfiles. Implementation of #360.
This commit is contained in:
commit
1027befea1
|
@ -7,10 +7,8 @@ ENV PYTHONUNBUFFERED 1
|
||||||
|
|
||||||
# Requirements have to be pulled and installed here, otherwise caching won't work
|
# Requirements have to be pulled and installed here, otherwise caching won't work
|
||||||
ADD ./requirements /requirements
|
ADD ./requirements /requirements
|
||||||
ADD ./requirements.txt /requirements.txt
|
|
||||||
|
|
||||||
RUN pip install -r /requirements.txt
|
RUN pip install -r /requirements/production.txt
|
||||||
RUN pip install -r /requirements/local.txt
|
|
||||||
|
|
||||||
RUN groupadd -r django && useradd -r -g django django
|
RUN groupadd -r django && useradd -r -g django django
|
||||||
ADD . /app
|
ADD . /app
|
||||||
|
|
25
{{cookiecutter.repo_name}}/Dockerfile-dev
Normal file
25
{{cookiecutter.repo_name}}/Dockerfile-dev
Normal 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 /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"]
|
|
@ -1,3 +1,4 @@
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres
|
image: postgres
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -6,6 +7,7 @@ postgres:
|
||||||
- /data/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data
|
- /data/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data
|
||||||
|
|
||||||
django:
|
django:
|
||||||
|
dockerfile: Dockerfile-dev
|
||||||
build: .
|
build: .
|
||||||
command: python /app/manage.py runserver_plus 0.0.0.0:8000
|
command: python /app/manage.py runserver_plus 0.0.0.0:8000
|
||||||
volumes:
|
volumes:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user