Merge pull request #148 from fly-apps/match-rails-dockerfiles

expand check to match Rails generated Dockerfiles
fly-apps · Feb 25, 2025 · 499267a · 499267a
2 parents 8449fc5 + b6c3b3c
commit 499267a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/generators/dockerfile_generator.rb b/lib/generators/dockerfile_generator.rb
@@ -418,7 +418,8 @@ def generate_app
       # Older versions no longer release new images
       matching_ruby = [">= 3.4.2", "~> 3.3.7", "~> 3.2.7", "~> 3.1.7"].any? { |v| Gem::Requirement.new(v).satisfied_by?(Gem.ruby_version) }
       # Only slim and alpine are missing libyaml-dev/yaml-dev
-      matching_image = /FROM ruby:.+-(alpine|slim)/i.match?(dockerfile)
+      # https://rubular.com/r/Jb4LEfrMSmxkp9
+      matching_image = /FROM (.*\/)?ruby:(.+-)?(alpine|slim)/i.match?(dockerfile)
       if !matching_ruby || !matching_image
         missing.delete("libyaml-dev")
         missing.delete("yaml-dev")