Skip to content

Commit

Permalink
Merge pull request #146 from fly-apps/libyaml-ruby-3.4.2
Browse files Browse the repository at this point in the history
require libyaml-dev for Ruby >= 3.4.1
  • Loading branch information
rubys authored Feb 21, 2025
2 parents f48c9f2 + 4f19d3c commit 2fb907d
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions lib/generators/dockerfile_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -410,10 +410,12 @@ def generate_app
missing = Set.new(base_packages + build_packages) -
Set.new(dockerfile.scan(/[-\w]+/))

# https://github.com/docker-library/ruby/pull/497
# https://github.com/rails/rails/pull/54237
missing.delete("libyaml-dev")
missing.delete("yaml-dev")
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("3.4.1")
# https://github.com/docker-library/ruby/pull/497
# https://github.com/rails/rails/pull/54237
missing.delete("libyaml-dev")
missing.delete("yaml-dev")
end

unless missing.empty?
message = "The following packages are missing from the Dockerfile: #{missing.to_a.join(", ")}"
Expand Down

0 comments on commit 2fb907d

Please sign in to comment.