accounting/frappe_docker
2
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-11-08 14:21:05 +00:00
Code Issues Releases Activity

fix: erpnext image build

Browse Source 
frappe/erpnext MUST be in editable mode
output migration log in test
This commit is contained in:
Revant Nandgaonkar 2020-06-28 07:40:33 +05:30
parent e6946fda75
commit 56bf984ef7
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/common/worker/install_app.sh
View File

@ -13,4 +13,4 @@ cd ./apps
[ "${APP_BRANCH}" ] && BRANCH="-b ${APP_BRANCH}" [ "${APP_BRANCH}" ] && BRANCH="-b ${APP_BRANCH}"
git clone --depth 1 -o upstream ${APP_REPO} ${BRANCH} git clone --depth 1 -o upstream ${APP_REPO} ${BRANCH}
pip3 install --no-cache-dir /home/frappe/frappe-bench/apps/${APP_NAME} pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/${APP_NAME}

2
build/frappe-worker/Dockerfile
View File

@ -37,7 +37,7 @@ RUN python -m venv env \
&& . env/bin/activate \ && . env/bin/activate \
&& cd apps \ && cd apps \
&& git clone --depth 1 -o upstream https://github.com/frappe/frappe --branch ${GIT_BRANCH} \ && 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 scripts and templates
COPY build/common/commands/* /home/frappe/frappe-bench/commands/ COPY build/common/commands/* /home/frappe/frappe-bench/commands/

5
tests/docker-test.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
function checkMigrationComplete() { function checkMigrationComplete() {
echo "Check Auto Migration" echo "Check Migration"
CONTAINER_ID=$(docker-compose \ CONTAINER_ID=$(docker-compose \
--project-name frappebench00 \ --project-name frappebench00 \
-f installation/docker-compose-common.yml \ -f installation/docker-compose-common.yml \
@ -21,6 +21,9 @@ function checkMigrationComplete() {
exit 1 exit 1
fi fi
done done
echo -e "\e[4mMigration Log\e[0m"
docker logs $CONTAINER_ID
} }
function loopHealthCheck() { function loopHealthCheck() {