diff --git a/CHANGELOG.md b/CHANGELOG.md index 815695ea2..5cc459daa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Updated sidekiq-unique-jobs to 7.1.23 to get rid of Sidekiq's default_worker_options deprecation warning - Allow moving with arrows in the setup script's inputs +- Ability to ignore assets compilation errors in the upgrade script - Fix a bug: unable to connect with OAuth2 - Fix a bug: when installing fab-manager as non-root user, most of the resulting installation directories were owned by root - Fix a bug: unable to edit OIDC provider diff --git a/setup/upgrade.sh b/setup/upgrade.sh index eb82a20e1..a966faa06 100644 --- a/setup/upgrade.sh +++ b/setup/upgrade.sh @@ -224,9 +224,9 @@ compile_assets() mkdir -p public/new_packs # shellcheck disable=SC2068 if ! docker run --user "$(id -u):$(id -g)" --rm --env-file ./config/env ${ENV_ARGS[@]} --link "$PG_ID" --net "$PG_NET_ID" -v "${PWD}/public/new_packs:/usr/src/app/public/packs" "$IMAGE" bundle exec rake assets:precompile; then - restore_tag - printf "\e[91m[ ❌ ] Something went wrong while compiling the assets, please check the logs above.\e[39m\nExiting...\n" - exit 4 + printf "\e[93m[ ⚠ ] Something may have went wrong while compiling the assets, please check the logs above.\e[39m\n" + [[ "$YES_ALL" = "true" ]] && confirm="y" || read -rp ":: Ignore and continue? (Y/n) " confirm