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

fix canvas_update for non-dockerized 

flag = none

Test Plan:
- running docker_dev_update succeeds
- running canvas_update on non-docker succeeds


Change-Id: I2b20ae04315b4bfbd7a90f5a9331f0354065d239
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/261263
Reviewed-by: Aaron Ogata <aogata@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
This commit is contained in:
James Butters 2021-03-22 08:21:45 -06:00
parent fc879f9b58
commit 41849fec6c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ function is_canvas_root {
function compile_assets {
echo_console_and_log " Compiling assets (css and js only, no docs or styleguide) ..."
_canvas_lms_track_with_log docker-compose run --rm web bundle exec rake canvas:compile_assets_dev
_canvas_lms_track_with_log run_command bundle exec rake canvas:compile_assets_dev
}
function build_images {
@ -99,12 +99,12 @@ If you want to migrate the existing database, use docker_dev_update
function bundle_install {
echo_console_and_log " Installing gems (bundle install) ..."
rm -f Gemfile.lock* >/dev/null 2>&1
_canvas_lms_track_with_log docker-compose run --rm web bundle install
_canvas_lms_track_with_log run_command bundle install
}
function bundle_install_with_check {
echo_console_and_log " Checking your gems (bundle check) ..."
if _canvas_lms_track_with_log docker-compose run --rm web bundle check ; then
if _canvas_lms_track_with_log run_command bundle check ; then
echo_console_and_log " Gems are up to date, no need to bundle install ..."
else
bundle_install
@ -113,14 +113,14 @@ function bundle_install_with_check {
function rake_db_migrate_dev_and_test {
echo_console_and_log " Migrating development DB ..."
_canvas_lms_track_with_log docker-compose run --rm web bundle exec rake db:migrate RAILS_ENV=development
_canvas_lms_track_with_log run_command bundle exec rake db:migrate RAILS_ENV=development
echo_console_and_log " Migrating test DB ..."
_canvas_lms_track_with_log docker-compose run --rm web bundle exec rake db:migrate RAILS_ENV=test
_canvas_lms_track_with_log run_command bundle exec rake db:migrate RAILS_ENV=test
}
function install_node_packages {
echo_console_and_log " Installing Node packages ..."
_canvas_lms_track_with_log docker-compose run --rm web bundle exec rake js:yarn_install
_canvas_lms_track_with_log run_command bundle exec rake js:yarn_install
}
function copy_docker_config {