dockerfile-rails 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d70002b918b2110952ebace8ba264db76189fe7f5a27b1985313871e9318af8f
-  data.tar.gz: 9cd5e7a99158113277978a9787cb099ba002d35d2dfaef2fba58d9abf1a67225
+  metadata.gz: 4ff1ee0c49a9ebbbb98ee4dd006a2e48d0c3c711e9f95057ab5b7048d2ee6916
+  data.tar.gz: eb82fe4009d35400dfab47747f2d3e115847a10e27f8ae17f405ac2db58dfba1
 SHA512:
-  metadata.gz: 93bc70acc19970a2813bfcd9e56138dd3216ea6998e8a883cff27a305e8cd2a6694a750333249e1367eea05b37edccc2183f2a1d09b2fc1f8f65428d66f38af4
-  data.tar.gz: 13f8868fbc6e5e09be03e3f323c9093e136b5b93d760d883d94057138f8e8c92ffd04841a5963a4c08175a011f03a44998ed7a396c2861da890ac4d3a6d8f001
+  metadata.gz: 9be4612b0a2d7cb9e8781e06f167a23732bff0f46cd3fc5233f26b41d7856859595e610b1a8ee169e65897e61fac03f928c1ada613576552650978a675a80c9f
+  data.tar.gz: '09c53a4ce9d8840ee27bd78a9acf0beea803d2200013484cb6c7a7db0dbcf55d5a68604938c24fd41aa036c3b154c79529a6119e8a440f27753dd5e530ec5010'

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/generators/dockerfile_generator.rb

@@ -410,6 +410,11 @@ class DockerfileGenerator < Rails::Generators::Base
       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")
+
       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 +1169,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.6
 platform: ruby
 authors:
 - Sam Ruby
 bindir: bin
 cert_chain: []
-date: 2025-01-31 00:00:00.000000000 Z
+date: 2025-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails