From 2c4c978ca244e79369155a17ea6df5fa3daa0f07 Mon Sep 17 00:00:00 2001 From: Lev Date: Tue, 23 Nov 2021 17:15:57 +0300 Subject: [PATCH] update --- tests/test-erpnext.sh | 6 ++---- tests/test-frappe.sh | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/test-erpnext.sh b/tests/test-erpnext.sh index a22d999b..ac0bcaf9 100755 --- a/tests/test-erpnext.sh +++ b/tests/test-erpnext.sh @@ -9,15 +9,13 @@ SITE_NAME="test_erpnext.localhost" echo ::group::Setup env cp env-example .env -sed -i -e "s/FRAPPE_VERSION=edge/FRAPPE_VERSION=$FRAPPE_VERSION/g" .env -sed -i -e "s/ERPNEXT_VERSION=edge/ERPNEXT_VERSION=test/g" .env +sed -i -e "s/edge/test/g" .env # shellcheck disable=SC2046 export $(cat .env) cat .env print_group Start services -FRAPPE_VERSION=$FRAPPE_VERSION ERPNEXT_VERSION="test" \ - docker-compose \ +docker-compose \ -p $project_name \ -f installation/docker-compose-common.yml \ -f installation/docker-compose-erpnext.yml \ diff --git a/tests/test-frappe.sh b/tests/test-frappe.sh index c28e0cfd..0161cf55 100755 --- a/tests/test-frappe.sh +++ b/tests/test-frappe.sh @@ -15,8 +15,7 @@ export $(cat .env) cat .env print_group Start services -FRAPPE_VERSION="test" \ - docker-compose \ +docker-compose \ -p $project_name \ -f installation/docker-compose-common.yml \ -f installation/docker-compose-frappe.yml \ @@ -32,4 +31,5 @@ docker run \ frappe/frappe-worker:test new ping_site +docker-compose down rm .env