Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ namespace :docker do
IO.write('tmp/ruby/.keep', '')
end
env_args = %w(cppflags optflags).map {|name| ["--build-arg", "#{name}=#{ENV[name]}"] }.flatten
sh 'docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static:register', '--reset' if arch
sh 'docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static:register', '--reset' if arch && arch != 'arm64'
sh 'docker', 'build', '-f', dockerfile, *tag_args, *env_args,
'--build-arg', "RUBY_VERSION=#{ruby_version}",
'--build-arg', "BASE_IMAGE_TAG=#{ubuntu_version(ruby_version)}",
Expand Down
5 changes: 5 additions & 0 deletions install_ruby.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ case $RUBY_VERSION in
;;
esac

# Since Ruby 2.6, Bundler is a part of Ruby’s standard library, but below this version we need to install Bundler.
if [ "$(printf '%s\n' "$RUBY_VERSION" "2.6.0" | sort -V | head -n1)" = "$RUBY_VERSION" ]; then
gem install bundler
fi

if test -n "$RUBY_MASTER_COMMIT"; then
if test -f /usr/src/ruby/configure.ac; then
cd /usr/src/ruby
Expand Down