Skip to content

Commit

Permalink
Merge pull request #109 from unt-libraries/docker-pipenv-no-system
Browse files Browse the repository at this point in the history
Avoid pipenv install --system
  • Loading branch information
ldko authored Jul 1, 2020
2 parents dab6eb1 + 6baacff commit 6f20446
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions appstart.sh
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down

0 comments on commit 6f20446

Please sign in to comment.