ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

run db:initial setup without -T 

flag = none

Change-Id: I5e3fc94bad9c24fc873956adde10a870ca1cf8f8
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/285848
Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
This commit is contained in:
James Butters 2022-02-23 11:16:07 -07:00
parent 77732bfb7e
commit b567f1f098
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/common/canvas/build_helpers.sh
View File

@ -111,7 +111,7 @@ If you want to migrate the existing database, cancel now
start_spinner "Migrating (Test env)...."
_canvas_lms_track_with_log run_command bundle exec rake db:migrate RAILS_ENV=test
stop_spinner
[[ ${dropped:-DROP} == 'migrate' ]] || _canvas_lms_track run_command bundle exec rake db:initial_setup
[[ ${dropped:-DROP} == 'migrate' ]] || _canvas_lms_track run_command_tty bundle exec rake db:initial_setup
}
function bundle_install {

9
script/common/utils/common.sh
View File

@ -50,6 +50,15 @@ function run_command {
"$@"
fi
}
# remove once https://github.com/docker/compose/issues/9104 is fixed
function run_command_tty {
if is_running_on_jenkins; then
docker-compose exec -T web "$@"
elif is_docker; then
# -T needed until https://github.com/docker/compose/issues/9104 is fixed
$DOCKER_COMMAND exec -e TELEMETRY_OPT_IN web "$@"
fi
}
function _canvas_lms_track {
command="$@"