cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-23 01:57:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removing using python wheels to build python dependecies due to issue resolving conflicts in package sub-dependencies. Ends up being much more trouble than it's worth.

Browse Source
This commit is contained in:
Arnav Choudhury 2020-09-12 11:04:08 +05:30
parent 07051bff33
commit a795086b10
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
View File

@ -15,8 +15,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
# cleaning up unused files # cleaning up unused files
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
# create python dependency wheels # install python dependencies
&& pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels -r /requirements/local.txt \ && pip install --no-cache-dir --use-feature=2020-resolver -r /requirements/local.txt \
&& rm -rf /requirements && rm -rf /requirements
@ -61,11 +61,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# copy python dependency wheels from python-build-stage
COPY --from=python-build-stage /usr/src/app/wheels /wheels
# install python dependencies # copy python dependencies from python-build-stage
RUN pip install --no-cache /wheels/* COPY --from=build_stage /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
COPY --from=build_stage /usr/local/bin/ /usr/local/bin/

15
{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
View File

@ -11,7 +11,7 @@ RUN npm run build
# Python build stage # Python build stage
FROM python:3.8-slim-buster as python-build-stage FROM python:3.8-slim-buster as python-build-stage
ENV PYTHONDONTWRITEBYTECODE 1
# Requirements are installed here to ensure they will be cached. # Requirements are installed here to ensure they will be cached.
COPY ./requirements /requirements COPY ./requirements /requirements
@ -26,14 +26,15 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
# cleaning up unused files # cleaning up unused files
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
# create python dependency wheels # install python dependencies
&& pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels -r /requirements/production.txt \ && pip install --no-cache-dir --use-feature=2020-resolver -r /requirements/production.txt \
&& rm -rf /requirements && rm -rf /requirements
# Python 'run' stage # Python 'run' stage
FROM python:3.8-slim-buster FROM python:3.8-slim-buster
ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
RUN addgroup --system django \ RUN addgroup --system django \
@ -76,11 +77,9 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# copy python dependency wheels from python-build-stage # copy python dependencies from python-build-stage
COPY --from=python-build-stage /usr/src/app/wheels /wheels COPY --from=build_stage /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
COPY --from=build_stage /usr/local/bin/ /usr/local/bin/
# install python dependencies
RUN pip install --no-cache /wheels/*
{%- if cookiecutter.js_task_runner == 'Gulp' %} {%- if cookiecutter.js_task_runner == 'Gulp' %}
COPY --from=client-builder --chown=django:django /app /app COPY --from=client-builder --chown=django:django /app /app