dockerfile-rails 1.7.6 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff1ee0c49a9ebbbb98ee4dd006a2e48d0c3c711e9f95057ab5b7048d2ee6916
-  data.tar.gz: eb82fe4009d35400dfab47747f2d3e115847a10e27f8ae17f405ac2db58dfba1
+  metadata.gz: 323ac3d7ebfcee1a4334665dab9fb789759ef29f06b96a92b794d6469e305437
+  data.tar.gz: c23c21898c2423422c30d88c5ec4f83d5de0817b57ba6a4429a8b40b1f5a1926
 SHA512:
-  metadata.gz: 9be4612b0a2d7cb9e8781e06f167a23732bff0f46cd3fc5233f26b41d7856859595e610b1a8ee169e65897e61fac03f928c1ada613576552650978a675a80c9f
-  data.tar.gz: '09c53a4ce9d8840ee27bd78a9acf0beea803d2200013484cb6c7a7db0dbcf55d5a68604938c24fd41aa036c3b154c79529a6119e8a440f27753dd5e530ec5010'
+  metadata.gz: 409645b414b857ba7af576f8cef3af8123b2e32d85cd532bfc10e94783ab0b4a67671d449c021d1d45385d351c17973c30ced78787f3e8dce72b6b6663de6936
+  data.tar.gz: b6ddaee116dc09517f42e271d9ce80d5d79468083f1ab3f8cd602e5bf36426eddeb8dcdf8a6bb40c3de6b62ed4c1bcb8eda608f44c4f25aadf97d86c60e86846

data/lib/dockerfile-rails/scanner.rb

@@ -43,23 +43,30 @@ module DockerfileRails
 
       ### database ###
 
+      # start by checkout config/database.yml.  It defaults to sqlite3,
+      # but we can't rely on that because DATABASE_URL can override it.
+      # if we see anything else, assume the change was intentional.
       database = YAML.load_file("config/database.yml", aliases: true).
         dig("production", "adapter") rescue nil
 
-      if database == "sqlite3"
-        @sqlite3 = true
-      elsif database == "postgresql"
+      if database == "postgresql"
         @postgresql = true
       elsif (database == "mysql") || (database == "mysql2") || (database == "trilogy")
         @mysql = true
       elsif database == "sqlserver"
         @sqlserver = true
-      end
 
-      @sqlite3 = true if @gemfile.include? "sqlite3"
-      @postgresql = true if @gemfile.include? "pg"
-      @mysql = true if @gemfile.include?("mysql2") || using_trilogy?
-      @sqlserver = true if @gemfile.include?("activerecord-sqlserver-adapter")
+      ## if not found (or sqlite3), check the Gemfile
+      elsif @gemfile.include? "pg"
+        @postgresql = true
+      elsif @gemfile.include?("mysql2") || using_trilogy?
+        @mysql = true
+      elsif @gemfile.include?("activerecord-sqlserver-adapter")
+        @sqlserver = true
+      elsif @gemfile.include?("sqlite3") || database == "sqlite3"
+        # check this one last as sqlite3 may be used in development
+        @sqlite3 = true
+      end
 
       ### node modules ###
 

data/lib/generators/dockerfile_generator.rb

@@ -410,10 +410,19 @@ class DockerfileGenerator < Rails::Generators::Base
       missing = Set.new(base_packages + build_packages) -
         Set.new(dockerfile.scan(/[-\w]+/))
 
+      # libyaml-dev was removed from the lightweight Ruby images
       # https://github.com/docker-library/ruby/pull/497
       # https://github.com/rails/rails/pull/54237
-      missing.delete("libyaml-dev")
-      missing.delete("yaml-dev")
+      # Ruby versions 3.4.2, 3.3.7, and 3.2.7 have been released removing libyaml-dev
+      # Ruby version 3.1.7 will be the release version to remove libyaml-dev
+      # 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)
+      if !matching_ruby || !matching_image
+        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(", ")}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.8
 platform: ruby
 authors:
 - Sam Ruby
 bindir: bin
 cert_chain: []
-date: 2025-02-06 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Dockerfile generator for Rails
 test_files: []