From 56bf984ef7c1b5fa155566831db8d2742d93dcfe Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sun, 28 Jun 2020 07:40:33 +0530 Subject: [PATCH] fix: erpnext image build frappe/erpnext MUST be in editable mode output migration log in test --- build/common/worker/install_app.sh | 2 +- build/frappe-worker/Dockerfile | 2 +- tests/docker-test.sh | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build/common/worker/install_app.sh b/build/common/worker/install_app.sh index 5f1023ec..c378be17 100755 --- a/build/common/worker/install_app.sh +++ b/build/common/worker/install_app.sh @@ -13,4 +13,4 @@ cd ./apps [ "${APP_BRANCH}" ] && BRANCH="-b ${APP_BRANCH}" git clone --depth 1 -o upstream ${APP_REPO} ${BRANCH} -pip3 install --no-cache-dir /home/frappe/frappe-bench/apps/${APP_NAME} \ No newline at end of file +pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/${APP_NAME} \ No newline at end of file diff --git a/build/frappe-worker/Dockerfile b/build/frappe-worker/Dockerfile index 109d250a..bcf78612 100644 --- a/build/frappe-worker/Dockerfile +++ b/build/frappe-worker/Dockerfile @@ -37,7 +37,7 @@ RUN python -m venv env \ && . env/bin/activate \ && cd apps \ && git clone --depth 1 -o upstream https://github.com/frappe/frappe --branch ${GIT_BRANCH} \ - && pip3 install --no-cache-dir /home/frappe/frappe-bench/apps/frappe + && pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/frappe # Copy scripts and templates COPY build/common/commands/* /home/frappe/frappe-bench/commands/ diff --git a/tests/docker-test.sh b/tests/docker-test.sh index 597c3c2a..d690feb0 100755 --- a/tests/docker-test.sh +++ b/tests/docker-test.sh @@ -1,7 +1,7 @@ #!/bin/bash function checkMigrationComplete() { - echo "Check Auto Migration" + echo "Check Migration" CONTAINER_ID=$(docker-compose \ --project-name frappebench00 \ -f installation/docker-compose-common.yml \ @@ -21,6 +21,9 @@ function checkMigrationComplete() { exit 1 fi done + + echo -e "\e[4mMigration Log\e[0m" + docker logs $CONTAINER_ID } function loopHealthCheck() {