dockerfile-rails 1.7.5 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d70002b918b2110952ebace8ba264db76189fe7f5a27b1985313871e9318af8f
-  data.tar.gz: 9cd5e7a99158113277978a9787cb099ba002d35d2dfaef2fba58d9abf1a67225
+  metadata.gz: 2e17b36ef8d027da87b7e6b8a956aec414dd6b3cae25f7defadbf5f37603cc53
+  data.tar.gz: e3b14e12a0e23b8b635e0aa23374e71f4ae83b4d87f2f67318fd8ad246d1a479
 SHA512:
-  metadata.gz: 93bc70acc19970a2813bfcd9e56138dd3216ea6998e8a883cff27a305e8cd2a6694a750333249e1367eea05b37edccc2183f2a1d09b2fc1f8f65428d66f38af4
-  data.tar.gz: 13f8868fbc6e5e09be03e3f323c9093e136b5b93d760d883d94057138f8e8c92ffd04841a5963a4c08175a011f03a44998ed7a396c2861da890ac4d3a6d8f001
+  metadata.gz: 7455998542f66e51f2d206832a2a6bf8785534d80a6e20ab801084b6e37e6ebde932510de69d3222c0bc13f244f388ed7031059c5206e149f62d9407fb5332b3
+  data.tar.gz: 7f915afac24acd50043103bac6cf3203abba39f28a727d686b4bd093cd580caeb6f0d9118708586a49ee1572b1361b21adbbd142276a32630bf9636b4d93c67a

data/README.md

@@ -67,7 +67,7 @@ are actually using.  But should you be using DATABASE_URL, for example, at runti
 additional support may be needed:
 
 * `--litefs` - use [LiteFS](https://fly.io/docs/litefs/)
-* `--litestream` - use [LiteFS](https://litestream.io/)
+* `--litestream` - use [Litestream](https://litestream.io/)
 * `--mysql` - add mysql libraries
 * `--postgresql` - add postgresql libraries
 * `--redis` - add redis libraries
@@ -120,6 +120,16 @@ Options are saved between runs into `config/dockerfile.yml`.  To invert a boolea
 
 ## Testing
 
+Run:
+
+Installation:
+
+```
+brew install postgresql mysql zstd
+bundle config --local build.mysql2 "--with-opt-dir="$(brew --prefix zstd)""
+bundle install
+```
+
 A single invocation of `rake test:all` will run all of the tests defined.  dockerfile-rails has are three types of tests:
 
   * `rake test:rubocop` runs [rubocop](https://github.com/rubocop/rubocop) using the same options as the Rails codebase.

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,6 +410,13 @@ class DockerfileGenerator < Rails::Generators::Base
       missing = Set.new(base_packages + build_packages) -
         Set.new(dockerfile.scan(/[-\w]+/))
 
+      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(", ")}"
         STDERR.puts "\n" + shell.set_color(message, Thor::Shell::Color::RED, Thor::Shell::Color::BOLD)
@@ -1164,11 +1171,11 @@ private
     else
       command = Shellwords.split(procfile.values.first)
 
-      if command.first == "./bin/thrust"
-        command[1..]
-      else
-        command
-      end
+      thrust = command.index("./bin/thrust")
+      thrust = command.index("litestream:run") if thrust.nil?
+      command = command[thrust + 1...] unless thrust.nil?
+
+      command
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.7
 platform: ruby
 authors:
 - Sam Ruby
 bindir: bin
 cert_chain: []
-date: 2025-01-31 00:00:00.000000000 Z
+date: 2025-02-21 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: []