diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2018-04-11 12:33:34 +0000 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2018-04-11 12:33:34 +0000 |
| commit | 312d21f12dd28c5ddeffd9202f8d2ab6d3b6308b (patch) | |
| tree | 193841846a25d104d2bc07874c04b5009498b6fa | |
| parent | 9c8de685411ed80575f8269d32e7ba1268d49efc (diff) | |
| parent | 39ed8c527f33cf7bd27acd9ea554f6082ed3f410 (diff) | |
Merge "LLP: Ensure PIP packages are updated and define settings when running debug"
| -rw-r--r-- | ci-amd64-llp-alpine/Dockerfile | 2 | ||||
| -rwxr-xr-x | ci-amd64-llp-alpine/docker_run.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ci-amd64-llp-alpine/Dockerfile b/ci-amd64-llp-alpine/Dockerfile index c53bb2fe..ee804cdf 100644 --- a/ci-amd64-llp-alpine/Dockerfile +++ b/ci-amd64-llp-alpine/Dockerfile @@ -16,7 +16,7 @@ RUN apk --update --no-cache add python2 py2-pip mysql-client git py-gunicorn sql apk --no-cache add gcc g++ python2-dev musl-dev libffi-dev postgresql-dev && \ git clone https://git.linaro.org/infrastructure/linaro-license-protection.git/ $APPDIR && \ pip2 install --upgrade pip setuptools six && \ - pip2 install -r $APPDIR/requirements.txt && \ + pip2 install -U -r $APPDIR/requirements.txt && \ apk del gcc g++ python3-dev musl-dev libffi-dev EXPOSE $PORT diff --git a/ci-amd64-llp-alpine/docker_run.sh b/ci-amd64-llp-alpine/docker_run.sh index 3d9fb6ca..52c27ae1 100755 --- a/ci-amd64-llp-alpine/docker_run.sh +++ b/ci-amd64-llp-alpine/docker_run.sh @@ -22,4 +22,5 @@ if [ -z "$DJANGO_DEBUG" ] ; then exec /usr/bin/gunicorn -w4 -b 0.0.0.0:$PORT $LLP_APP fi -exec python $APPDIR/manage.py runserver 0.0.0.0:8080 +python $APPDIR/manage.py migrate --noinput --settings=settings +exec python $APPDIR/manage.py runserver 0.0.0.0:8080 --settings=settings |