Merge pull request #27 from alphagov/BUGFIX-run-app-in-venv

BUGFIX Run application processes in a virtualenv

VERSION

@@ -1 +1 @@
-3.0.1
+3.1.0

api.docker

@@ -2,8 +2,9 @@ FROM digitalmarketplace/base
 
 COPY nginx/api /etc/nginx/sites-enabled/api
 
+ONBUILD RUN python -m venv venv
 ONBUILD COPY requirements.txt ${APP_DIR}
-ONBUILD RUN pip install --no-cache-dir -r requirements.txt
+ONBUILD RUN venv/bin/pip install --no-cache-dir -r requirements.txt
 
 ONBUILD COPY . ${APP_DIR}
 

base.docker

@@ -8,7 +8,7 @@ ENV YARN_VERSION 1.3.2-1
 RUN apt-get update && \
     apt-get install -y --no-install-recommends nginx \
                     libpcre3-dev libpq-dev libffi-dev libxml2-dev libxslt-dev python-setuptools libssl-dev \
-                    gcc make git curl xz-utils python2.7 python-pip apt-transport-https gnupg && \
+                    gcc make git curl xz-utils python2.7 python-pip python-virtualenv apt-transport-https gnupg && \
     curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" && \
     tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 && \
     rm "node-v$NODE_VERSION-linux-x64.tar.xz" && \

frontend.docker

@@ -2,8 +2,9 @@ FROM digitalmarketplace/base
 
 COPY nginx/frontend /etc/nginx/sites-enabled/frontend
 
+ONBUILD RUN python -m venv venv
 ONBUILD COPY requirements.txt ${APP_DIR}
-ONBUILD RUN pip install --no-cache-dir -r requirements.txt
+ONBUILD RUN venv/bin/pip install --no-cache-dir -r requirements.txt
 
 ONBUILD COPY package.json ${APP_DIR}
 ONBUILD COPY yarn.lock ${APP_DIR}

uwsgi.conf

@@ -1,6 +1,8 @@
 [uwsgi]
 uid = www-data
 gid = www-data
+
+virtualenv = venv
 module = application:application
 
 socket = /run/uwsgi.sock