2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-12-23 02:28:57 +00:00

ci: fix lint

This commit is contained in:
Revant Nandgaonkar 2021-11-22 05:36:59 +05:30
parent 4f7108c3a8
commit 8fc3fbb27e
3 changed files with 17 additions and 17 deletions

View File

@ -25,16 +25,6 @@ ping_site() {
fi fi
} }
docker_compose_with_args() {
# shellcheck disable=SC2068
docker-compose \
-p $project_name \
-f installation/docker-compose-common.yml \
-f installation/docker-compose-frappe.yml \
-f installation/frappe-publish.yml \
$@
}
check_migration_complete() { check_migration_complete() {
print_group Check migration print_group Check migration
@ -63,8 +53,8 @@ check_health() {
print_group Loop health check print_group Loop health check
docker run --name frappe_doctor \ docker run --name frappe_doctor \
-v "${project_name}_sites-vol:/home/frappe/frappe-bench/sites" \ -v "$1_sites-vol:/home/frappe/frappe-bench/sites" \
--network "${project_name}_default" \ --network "$1_default" \
frappe/frappe-worker:edge doctor || true frappe/frappe-worker:edge doctor || true
cmd='docker logs frappe_doctor | grep "Health check successful" || echo ""' cmd='docker logs frappe_doctor | grep "Health check successful" || echo ""'

View File

@ -6,6 +6,16 @@ source tests/functions.sh
project_name=frappe_bench_00 project_name=frappe_bench_00
docker_compose_with_args() {
# shellcheck disable=SC2068
docker-compose \
-p $project_name \
-f installation/docker-compose-common.yml \
-f installation/docker-compose-frappe.yml \
-f installation/frappe-publish.yml \
$@
}
# Initial group # Initial group
echo ::group::Setup .env echo ::group::Setup .env
cp env-example .env cp env-example .env
@ -28,7 +38,7 @@ docker run \
--network ${project_name}_default \ --network ${project_name}_default \
postgres:11.8 postgres:11.8
check_health check_health $project_name
print_group "Create new site " print_group "Create new site "
SITE_NAME=test.localhost SITE_NAME=test.localhost
@ -123,7 +133,7 @@ docker_compose_with_args stop
docker container prune -f && docker volume prune -f docker container prune -f && docker volume prune -f
docker_compose_with_args up -d docker_compose_with_args up -d
check_health check_health $project_name
print_group Restore backup from S3 print_group Restore backup from S3
docker run \ docker run \
@ -139,7 +149,7 @@ docker run \
--network ${project_name}_default \ --network ${project_name}_default \
frappe/frappe-worker:edge restore-backup frappe/frappe-worker:edge restore-backup
check_health check_health $project_name
ping_site ping_site
SITE_NAME=$PG_SITE_NAME ping_site SITE_NAME=$PG_SITE_NAME ping_site
@ -153,7 +163,7 @@ docker run \
--network ${project_name}_default \ --network ${project_name}_default \
frappe/frappe-worker:edge new frappe/frappe-worker:edge new
check_health check_health $project_name
SITE_NAME=$EDGE_SITE_NAME ping_site SITE_NAME=$EDGE_SITE_NAME ping_site
print_group Migrate edge site print_group Migrate edge site

View File

@ -36,7 +36,7 @@ docker run \
docker restart ${project_name}_erpnext-nginx_1 docker restart ${project_name}_erpnext-nginx_1
docker restart ${project_name}_fix-vol-permissions_1 docker restart ${project_name}_fix-vol-permissions_1
check_health check_health $project_name
ping_site ping_site
rm .env rm .env