dockerfile-rails 1.6.22 → 1.6.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57f94bd7d0ee06690024d3a5beab4dc55bc02efcd8ccd390d5ba24e046cef2f
-  data.tar.gz: e6d155a91c132c60a214159668ba4998d20bbb5ad3192d852c4377eed43d72e3
+  metadata.gz: 3d63730b1e3ff8ac7968202d2511f66b51f2faa890350ab71b7f553538aebaae
+  data.tar.gz: f5b546990dbdcc931c5cac7ace90c7219b2af280271c8650b82dc23a33f3ac76
 SHA512:
-  metadata.gz: ac80ebf094d7ac05106cbc7680a56452c5bca6c7d30c4a30ccb32f5e43042d50139e997a7866233c51d8c38234cf3568f06c4eafb2a3d281391a4379da256df4
-  data.tar.gz: 7bb349afdf55b80f8495c1034bc5b490fddc2488b110b219ffcb878f67c51c50720ec168340a72b3e5ec9854d4f97af77e3ed7ae23ae0e25d6678c901b75ea75
+  metadata.gz: be28e7ce7e16ea25334727debb71c212bf976fcc602863479ee9ea908849939a9e9ce3e6acbfbd5bfb1ae3c5d0d768c448f8bacfc321543a5fe9a8dd93a55634
+  data.tar.gz: 2e4236bcc182926d0667bc0ff69e24e3034985cce89c0a99690da808029a20d1a1e9bec982d15ed273b877bd374819d490feb76fe46a61478f2e7b98473de6b7

data/lib/generators/dockerfile_generator.rb

@@ -336,6 +336,10 @@ class DockerfileGenerator < Rails::Generators::Base
         force: File.exist?("fly.toml")
     end
 
+    if solidq_launcher == :puma && !File.read("config/puma.rb").include?(":solid_queue")
+      append_to_file "config/puma.rb", "\n# Run the Solid Queue's supervisor\nplugin :solid_queue\n"
+    end
+
     if using_litefs?
       template "litefs.yml.erb", "config/litefs.yml"
 
@@ -427,6 +431,10 @@ class DockerfileGenerator < Rails::Generators::Base
           env["HTTP_PORT"] = "8080"
         end
 
+        if solidq_launcher == :env && !dockerfile.include?("SOLID_QUEUE_IN_PUMA")
+          env["SOLID_QUEUE_IN_PUMA"] = "true"
+        end
+
         unless env.empty?
           toml = IO.read("fly.toml")
           if !toml.include?("[[env]]")
@@ -546,6 +554,22 @@ private
     @gemfile.include?("solid_queue") and includes_jobs?
   end
 
+  def solidq_launcher
+    if !using_solidq?
+      :none
+    elsif deploy_database != "sqlite3"
+      :process
+    elsif File.exist? "config/puma.rb"
+      if File.read("config/puma.rb").include?("SOLID_QUEUE_IN_PUMA")
+        File.exist?("fly.toml") ? :env : :none
+      else
+        :puma
+      end
+    else
+      :procfile
+    end
+  end
+
   def parallel?
     (using_node? || using_bun?) && options.parallel
   end
@@ -986,6 +1010,10 @@ private
       env.merge! @@args["deploy"].to_h { |key, value| [key, "$#{key}"] }
     end
 
+    if solidq_launcher == :env
+      env["SOLID_QUEUE_IN_PUMA"] = "true"
+    end
+
     env.merge! @@vars["deploy"] if @@vars["deploy"]
 
     env.map { |key, value| "#{key}=#{value.inspect}" }.sort
@@ -1212,23 +1240,29 @@ private
 
   def procfile
     if using_passenger?
-      {
+      base = {
         nginx: "nginx"
       }
     elsif options.nginx?
-      {
+      base = {
         nginx: '/usr/sbin/nginx -g "daemon off;"',
         rails: "./bin/rails server -p 3001"
       }
     elsif using_thruster?
-      {
+      base = {
         rails: "bundle exec thrust ./bin/rails server"
       }
     else
-      {
+      base = {
         rails: "./bin/rails server"
       }
     end
+
+    if solidq_launcher == :procfile
+      base["solidq"] = "bundle exec rake solid_queue:start"
+    end
+
+    base
   end
 
   def using_thruster?
@@ -1248,7 +1282,11 @@ private
     if using_sidekiq?
       list["sidekiq"] = "bundle exec sidekiq"
     elsif using_solidq?
-      list["solidq"] = "bundle exec rake solid_queue:start"
+      if deploy_database == "sqlite3"
+        return if list.size <= 1
+      else
+        list["solidq"] = "bundle exec rake solid_queue:start"
+      end
     end
 
     list
@@ -1277,7 +1315,7 @@ private
     volumes = %w[ log storage ]
 
     if deploy_database == "sqlite3"
-      database = YAML.load_file("config/database.yml", aliases: true).dig("production", "database")
+      database = YAML.load_file("config/database.yml", aliases: true).dig("production", "database") rescue nil
       if database && database =~ /^\w/
         volumes << File.dirname(database)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.22
+  version: 1.6.24
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails