Skip to content

Commit 499267a

Browse files
authored
Merge pull request #148 from fly-apps/match-rails-dockerfiles
expand check to match Rails generated Dockerfiles
2 parents 8449fc5 + b6c3b3c commit 499267a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

lib/generators/dockerfile_generator.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,8 @@ def generate_app
418418
# Older versions no longer release new images
419419
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) }
420420
# Only slim and alpine are missing libyaml-dev/yaml-dev
421-
matching_image = /FROM ruby:.+-(alpine|slim)/i.match?(dockerfile)
421+
# https://rubular.com/r/Jb4LEfrMSmxkp9
422+
matching_image = /FROM (.*\/)?ruby:(.+-)?(alpine|slim)/i.match?(dockerfile)
422423
if !matching_ruby || !matching_image
423424
missing.delete("libyaml-dev")
424425
missing.delete("yaml-dev")

0 commit comments

Comments
 (0)