From 4a52845a269584ade6c3198c84705a95f1e6ef78 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Wed, 16 Sep 2020 15:24:16 +0530
Subject: [PATCH] Replaced copying python package directories with wheel files
 which are then used to install all requirements. This way the generated
 images would be a lot more stable as well. Size increases by 2-3mb though

---
 .../compose/local/django/Dockerfile           | 20 ++++++++---------
 .../compose/production/django/Dockerfile      | 22 ++++++++++++-------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 645b0476..c34f8ad4 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -7,19 +7,18 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   build-essential \
   # psycopg2 dependencies
   libpq-dev \
-  # Translations dependencies
-  gettext \
   # cleaning up unused files
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/*
 
+
 # Requirements are installed here to ensure they will be cached.
 COPY ./requirements /requirements
 
-# install python dependencies
-RUN pip install --no-cache-dir --use-feature=2020-resolver -r /requirements/local.txt \
-    && rm -rf /requirements
-
+# create python dependency wheels
+RUN pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels  \
+  -r /requirements/local.txt \
+  && rm -rf /requirements
 
 
 # Python 'run' stage
@@ -62,11 +61,12 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   && rm -rf /var/lib/apt/lists/*
 
 
+# copy python dependency wheels from python-build-stage
+COPY --from=python-build-stage /usr/src/app/wheels  /wheels
 
-# copy python dependencies from python-build-stage
-COPY --from=python-build-stage /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
-COPY --from=python-build-stage /usr/local/bin/ /usr/local/bin/
-
+# use wheels to install python dependencies
+RUN pip install --no-cache /wheels/* \
+	&& rm -rf /wheels
 
 
 WORKDIR /app
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index cc46464b..a2f432cc 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -11,25 +11,28 @@ RUN npm run build
 
 # Python build stage
 FROM python:3.8-slim-buster as python-build-stage
+
 ENV PYTHONDONTWRITEBYTECODE 1
+ARG BUILD_ENVIRONMENT
+
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
   # dependencies for building Python packages
   build-essential \
   # psycopg2 dependencies
   libpq-dev \
-  # Translations dependencies
-  gettext \
   # cleaning up unused files
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/*
 
+
 # Requirements are installed here to ensure they will be cached.
 COPY ./requirements /requirements
 
-# install python dependencies
-Run pip install --no-cache-dir --use-feature=2020-resolver -r /requirements/production.txt \
-    && rm -rf /requirements
+# create python dependency wheels
+RUN pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels  \
+  -r /requirements/production.txt \
+  && rm -rf /requirements
 
 # Python 'run' stage
 FROM python:3.8-slim-buster as python-run-stage
@@ -77,9 +80,12 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   && rm -rf /var/lib/apt/lists/*
 
 
-# copy python dependencies from python-build-stage
-COPY --from=python-build-stage /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
-COPY --from=python-build-stage /usr/local/bin/ /usr/local/bin/
+# copy python dependency wheels from python-build-stage
+COPY --from=python-build-stage /usr/src/app/wheels  /wheels
+
+# use wheels to install python dependencies
+RUN pip install --no-cache /wheels/* \
+	&& rm -rf /wheels
 
 {%- if cookiecutter.js_task_runner == 'Gulp' %}
 COPY --from=client-builder --chown=django:django /app /app