diff --git a/.s2i/bin/assemble b/.s2i/bin/assemble index 8f066d31a..1857d269c 100755 --- a/.s2i/bin/assemble +++ b/.s2i/bin/assemble @@ -13,11 +13,17 @@ set -e set -x -# Now install the root project too, micropipenv does not do that -pip install . --no-deps +echo "---> Installing poetry ..." +install_tool poetry + +echo "---> Upgrade Poetry's pip to the latest version ..." +$VENV_DIR/bin/pip install --upgrade pip + +echo "---> Installing application and dependencies ..." +poetry install --only main --all-extras # Set the version in an environment variable for the frontend to pickup -VITE_VERSION=$(pip show fmn | grep ^Version: | cut -d' ' -f2) +VITE_VERSION=$(poetry run pip show fmn | grep ^Version: | cut -d' ' -f2) if [ -n "${OPENSHIFT_BUILD_COMMIT}" -a -n "${OPENSHIFT_BUILD_REFERENCE}" ]; then VITE_VERSION="${VITE_VERSION} (${OPENSHIFT_BUILD_REFERENCE}:${OPENSHIFT_BUILD_COMMIT:0:7})" fi diff --git a/.s2i/environment b/.s2i/environment index 91b63f528..0a697a2b5 100644 --- a/.s2i/environment +++ b/.s2i/environment @@ -4,7 +4,6 @@ UPGRADE_PIP_TO_LATEST=true DISABLE_PYPROJECT_TOML_PROCESSING=true -ENABLE_MICROPIPENV=true # APP_SCRIPT=.s2i/run-api.sh # APP_SCRIPT=.s2i/run-consumer.sh # APP_SCRIPT=.s2i/run-sender.sh