From 6baacff012c9238bd3932d74fe7182088e8e44fb Mon Sep 17 00:00:00 2001 From: Lauren Ko Date: Wed, 1 Jul 2020 16:05:16 -0500 Subject: [PATCH] Avoid pipenv install --system --- Dockerfile | 2 +- appstart.sh | 5 ++--- docker-compose.yml | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d55560..b96ff8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update -qq && apt-get install -y mysql-client netcat RUN pip install -U pip setuptools RUN pip install pipenv -RUN pipenv install --dev --system --deploy --ignore-pipfile +RUN pipenv install --dev --deploy --ignore-pipfile ADD wait-for-mysqld.sh /wait-for-mysqld.sh ADD appstart.sh /appstart.sh diff --git a/appstart.sh b/appstart.sh index 59e483e..74e2e33 100755 --- a/appstart.sh +++ b/appstart.sh @@ -1,7 +1,6 @@ #!/bin/bash /wait-for-mysqld.sh echo "Migrate..." -python manage.py migrate --settings=tests.settings +pipenv run python manage.py migrate --settings=tests.settings echo "Start app..." -python manage.py runserver 0.0.0.0:80 --settings=tests.settings - +pipenv run python manage.py runserver 0.0.0.0:80 --settings=tests.settings diff --git a/docker-compose.yml b/docker-compose.yml index 45cfad8..febc162 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ services: environment: - DJANGO_SETTINGS_MODULE=tests.settings - PES_BACKEND=mysql - entrypoint: tox -c /app/tox.ini + entrypoint: pipenv run tox -c /app/tox.ini --skip-missing-interpreters true links: - db depends_on: @@ -48,7 +48,7 @@ services: environment: - DJANGO_SETTINGS_MODULE=tests.settings - PES_BACKEND=mysql - entrypoint: /app/manage.py + entrypoint: pipenv run /app/manage.py links: - db depends_on: