cd "$RELEASE_PATH"
export RAILS_ENV=production
- if ! bundle --version >/dev/null 2>&1; then
- run_and_report "Installing bundler" gem install bundler --version 2.2.19 --no-document
+ run_and_report "Installing bundler" gem install --conservative --version '~> 2.4.0' bundler
+ local bundle="$(gem contents --version '~> 2.4.0' bundler | grep -E '/(bin|exe)/bundle$' | tail -n1)"
+ if ! [ -x "$bundle" ]; then
+ # Some distros (at least Ubuntu 24.04) append the Ruby version to the
+ # executable name, but that isn't reflected in the output of
+ # `gem contents`. Check for that version.
+ bundle="$bundle$(ruby -e 'puts RUBY_VERSION.split(".")[..1].join(".")')"
+ if ! [ -x "$bundle" ]; then
+ echo "Error: failed to find \`bundle\` command after installing bundler gem" >&2
+ return 1
+ fi
fi
+ local bundle_path="$SHARED_PATH/vendor_bundle"
run_and_report "Running bundle config set --local path $SHARED_PATH/vendor_bundle" \
- bundle config set --local path "$SHARED_PATH/vendor_bundle"
-
- run_and_report "Running bundle install" \
- bundle install --prefer-local --quiet
-
- # As of April 2024/Bundler 2.4, for some reason `bundle install` skips
- # zlib if it's already installed as a system-wide gem, which it often will
- # be because arvados gems pull it in. If this happened, install it in the
- # bundle manually as a workaround.
- if ! bin/bundle info zlib >/dev/null 2>&1; then
- local RUBY_VERSION="$(ruby -e 'puts RUBY_VERSION')"
- run_and_report "Adding zlib to bundle" \
- gem install \
- --install-dir="$SHARED_PATH/vendor_bundle/ruby/$RUBY_VERSION" \
- vendor/cache/zlib-*.gem
- fi
+ "$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 \
+ --install-dir="$bundle_path/ruby/$(ruby -e 'puts RUBY_VERSION')"
+ 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
chown -R "$WWW_OWNER:" $RELEASE_PATH/tmp
- setup_before_nginx_restart
-
if [ -n "$SERVICE_MANAGER" ]; then
service_command "$SERVICE_MANAGER" restart "$WEB_SERVICE"
fi