From 0cff0e4fd39ebfb75d81ecfbdc8da996d59934eb Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Sat, 21 Sep 2019 10:50:43 +1000
Subject: Revert uwsgi back to pip install.

---
 docker/app/Dockerfile       | 5 +++--
 docker/app/local.Dockerfile | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'docker')

diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
index 15b1f77b..67b3ef69 100644
--- a/docker/app/Dockerfile
+++ b/docker/app/Dockerfile
@@ -11,7 +11,7 @@ ENV PIP_NO_CACHE_DIR=false \
 RUN useradd --system --shell /bin/false --uid 1500 pysite
 
 # Install prerequisites needed to complete the dependency installation.
-RUN install_packages git uwsgi
+RUN install_packages git gcc libc-dev libpq-dev
 
 # Copy the project files into the working directory.
 WORKDIR /app
@@ -19,7 +19,8 @@ COPY . .
 
 # Update setuptools by removing egg first, add other dependencies
 RUN rm -r /opt/bitnami/python/lib/python3.*/site-packages/setuptools* && \
-    pip install --no-cache-dir -U setuptools pipenv
+    pip install -U setuptools
+RUN pip install pipenv uwsgi
 RUN pipenv install --system --deploy
 
 # Migrate, collect and start the app.
diff --git a/docker/app/local.Dockerfile b/docker/app/local.Dockerfile
index 124dab95..2c95cea3 100644
--- a/docker/app/local.Dockerfile
+++ b/docker/app/local.Dockerfile
@@ -10,7 +10,7 @@ ENV PIP_NO_CACHE_DIR=false \
 RUN useradd --system --shell /bin/false --uid 1500 pysite
 
 # Install prerequisites needed to complete the dependency installation.
-RUN install_packages git uwsgi
+RUN install_packages git gcc libc-dev libpq-dev
 
 # Copy the project files into the working directory.
 WORKDIR /app
@@ -18,7 +18,8 @@ COPY . .
 
 # Update setuptools by removing egg first, add other dependencies
 RUN rm -r /opt/bitnami/python/lib/python3.*/site-packages/setuptools* && \
-    pip install --no-cache-dir -U setuptools pipenv
+    pip install -U setuptools
+RUN pip install pipenv uwsgi
 RUN pipenv install --system --deploy
 
 RUN SECRET_KEY=placeholder DATABASE_URL=sqlite:// python3 manage.py collectstatic --no-input --clear --verbosity 0
-- 
cgit v1.2.3