diff --git a/contrib/scripts/docker/run-tests.sh b/contrib/scripts/docker/run-tests.sh index 3b47614625..11b4a327ef 100755 --- a/contrib/scripts/docker/run-tests.sh +++ b/contrib/scripts/docker/run-tests.sh @@ -3,6 +3,6 @@ apt-get update apt-get install -y --no-install-recommends tesseract-ocr-deu -pip install -r $DOCKER_ROOT/requirements-testing.txt +$MAYAN_PIP_BIN install -r $DOCKER_ROOT/requirements-testing.txt -mayan-edms.py test --mayan-apps --settings=mayan.settings.testing +$MAYAN_BIN test --mayan-apps --settings=mayan.settings.testing diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index a64f6a2358..cb2c34ede2 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -19,6 +19,7 @@ export MAYAN_SETTINGS_MODULE=${MAYAN_SETTINGS_MODULE:-mayan.settings.production} export MAYAN_GUNICORN_BIN=${MAYAN_PYTHON_BIN_DIR}gunicorn export MAYAN_GUNICORN_WORKERS=${MAYAN_GUNICORN_WORKERS:-2} +export MAYAN_PIP_BIN=${MAYAN_PYTHON_BIN_DIR}pip export CELERY_ALWAYS_EAGER=False export PYTHONPATH=$PYTHONPATH:$MAYAN_MEDIA_ROOT @@ -53,7 +54,7 @@ os_package_installs() { pip_installs() { echo "mayan: pip_installs()" if [ "${MAYAN_PIP_INSTALLS}" ]; then - pip install $MAYAN_PIP_INSTALLS + $MAYAN_PIP_BIN install $MAYAN_PIP_INSTALLS fi }