X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/060d38d627bd1e51dd2b3c6e7de9af6aa7d7b6f3..bfb1c2befc24e5706ac2917e723aaf93638df886:/build/rails-package-scripts/postinst.sh diff --git a/build/rails-package-scripts/postinst.sh b/build/rails-package-scripts/postinst.sh index 789a7ee17e..1d426baa73 100644 --- a/build/rails-package-scripts/postinst.sh +++ b/build/rails-package-scripts/postinst.sh @@ -10,12 +10,6 @@ set -e DATABASE_READY=1 APPLICATION_READY=1 -if [ -s "$HOME/.rvm/scripts/rvm" ] || [ -s "/usr/local/rvm/scripts/rvm" ]; then - COMMAND_PREFIX="/usr/local/rvm/bin/rvm-exec default" -else - COMMAND_PREFIX= -fi - report_not_ready() { local ready_flag="$1"; shift local config_file="$1"; shift @@ -125,17 +119,17 @@ setup_conffile() { } prepare_database() { - DB_MIGRATE_STATUS=`$COMMAND_PREFIX bundle exec rake db:migrate:status 2>&1 || true` + DB_MIGRATE_STATUS=`bin/rake db:migrate:status 2>&1 || true` if echo "$DB_MIGRATE_STATUS" | grep -qF 'Schema migrations table does not exist yet.'; then # The database exists, but the migrations table doesn't. - run_and_report "Setting up database" $COMMAND_PREFIX bundle exec \ - rake "$RAILSPKG_DATABASE_LOAD_TASK" db:seed + run_and_report "Setting up database" bin/rake \ + "$RAILSPKG_DATABASE_LOAD_TASK" db:seed elif echo "$DB_MIGRATE_STATUS" | grep -q '^database: '; then run_and_report "Running db:migrate" \ - $COMMAND_PREFIX bundle exec rake db:migrate + bin/rake db:migrate elif echo "$DB_MIGRATE_STATUS" | grep -q 'database .* does not exist'; then if ! run_and_report "Running db:setup" \ - $COMMAND_PREFIX bundle exec rake db:setup 2>/dev/null; then + bin/rake db:setup 2>/dev/null; then echo "Warning: unable to set up database." >&2 DATABASE_READY=0 fi @@ -186,10 +180,6 @@ configure_version() { setup_confdirs /etc/arvados "$CONFIG_PATH" setup_conffile environments/production.rb environments/production.rb.example \ || true - setup_conffile application.yml application.yml.example || APPLICATION_READY=0 - if [ -n "$RAILSPKG_DATABASE_LOAD_TASK" ]; then - setup_conffile database.yml database.yml.example || DATABASE_READY=0 - fi setup_extra_conffiles echo "... done." @@ -202,12 +192,32 @@ configure_version() { cd "$RELEASE_PATH" export RAILS_ENV=production - if ! $COMMAND_PREFIX bundle --version >/dev/null; then - run_and_report "Installing bundle" $COMMAND_PREFIX gem install bundle - fi - - run_and_report "Running bundle install" \ - $COMMAND_PREFIX bundle install --path $SHARED_PATH/vendor_bundle --local --quiet + # We install Bundler itself in the same place where Bundler will install + # bundled gems, for a few reasons: + # 1. Bundler will probably want to do this anyway to run itself with the + # specific version named in Gemfile.lock. + # 2. This is nicer to the sysadmin since we avoid messing with global state. + # 3. We can know exactly where the `bundle` command got installed. + local bundle_path="$SHARED_PATH/vendor_bundle" + export GEM_HOME="$bundle_path/ruby/$(ruby -e 'puts RUBY_VERSION')" + export GEM_PATH="$GEM_HOME" + run_and_report "Installing bundler" gem install --conservative --version '~> 2.4.0' bundler + local bundle="$GEM_HOME/bin/bundle" + + run_and_report "Running bundle config set --local path $SHARED_PATH/vendor_bundle" \ + "$bundle" config set --local path "$bundle_path" + + # As of April 2024/Bundler 2.4, `bundle install` tends not to install gems + # which are already installed system-wide, which causes bundle activation to + # fail later. Work around this by installing all gems manually. + find vendor/cache -maxdepth 1 -name '*.gem' -print0 \ + | run_and_report "Installing bundle gems" xargs -0r \ + gem install --conservative --ignore-dependencies --local --quiet + # The earlier `bundle config` should have it looking for installed gems in + # the right place. Unset GEM_* now to be sure. + unset GEM_HOME GEM_PATH + run_and_report "Running bundle install" "$bundle" install --prefer-local --quiet + run_and_report "Verifying bundle is complete" "$bundle" exec true echo -n "Ensuring directory and file permissions ..." # Ensure correct ownership of a few files @@ -216,9 +226,14 @@ configure_version() { chown "$WWW_OWNER:" $RELEASE_PATH/Gemfile.lock chown -R "$WWW_OWNER:" $RELEASE_PATH/tmp || true chown -R "$WWW_OWNER:" $SHARED_PATH/log + # Make sure postgres doesn't try to use a pager. + export PAGER= case "$RAILSPKG_DATABASE_LOAD_TASK" in - db:schema:load) chown "$WWW_OWNER:" $RELEASE_PATH/db/schema.rb ;; - db:structure:load) chown "$WWW_OWNER:" $RELEASE_PATH/db/structure.sql ;; + # db:structure:load was deprecated in Rails 6.1 and shouldn't be used. + db:schema:load | db:structure:load) + chown "$WWW_OWNER:" $RELEASE_PATH/db/schema.rb || true + chown "$WWW_OWNER:" $RELEASE_PATH/db/structure.sql || true + ;; esac chmod 644 $SHARED_PATH/log/* chmod -R 2775 $RELEASE_PATH/tmp || true @@ -228,19 +243,15 @@ configure_version() { prepare_database fi - if [ 11 = "$RAILSPKG_SUPPORTS_CONFIG_CHECK$APPLICATION_READY" ]; then - run_and_report "Checking application.yml for completeness" \ - $COMMAND_PREFIX bundle exec rake config:check || APPLICATION_READY=0 - fi - - # precompile assets; thankfully this does not take long - if [ "$APPLICATION_READY" = "1" ]; then - run_and_report "Precompiling assets" \ - $COMMAND_PREFIX bundle exec rake assets:precompile -q -s 2>/dev/null \ - || APPLICATION_READY=0 + if [ -e /etc/arvados/config.yml ]; then + # warn about config errors (deprecated/removed keys from + # previous version, etc) + run_and_report "Checking configuration for completeness" \ + bin/rake config:check || APPLICATION_READY=0 else - echo "Precompiling assets... skipped." + APPLICATION_READY=0 fi + chown -R "$WWW_OWNER:" $RELEASE_PATH/tmp setup_before_nginx_restart @@ -258,5 +269,4 @@ elif [ "$1" = "0" ] || [ "$1" = "1" ] || [ "$1" = "2" ]; then configure_version fi -report_not_ready "$DATABASE_READY" "$CONFIG_PATH/database.yml" -report_not_ready "$APPLICATION_READY" "$CONFIG_PATH/application.yml" +report_not_ready "$APPLICATION_READY" "/etc/arvados/config.yml"