dockerfile-rails 1.6.23 → 1.6.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 470ee4a04d8cdca1cb340ac2c1b72bf5948900e50ad7a500e496ea8659e7b848
-  data.tar.gz: 16cc734ca04cb5e3c514135b130880ff1abf373ae4a415692aafdf723b5e6458
+  metadata.gz: 749745baff7e3b0f67b72f9f94c2df9086c344c9665e2d67498c02c33cfbcbab
+  data.tar.gz: 1b62d4bcf87fd0872057ee0e796b8f529a3b29b811e13447e7ac7df60961ab80
 SHA512:
-  metadata.gz: c3d1dd01ab68286af66e8ab402dbb1e2d5b47a4d1841608d6a5d343bb9c3940b8cafe0e94439ee7621caa658deb70742a79bcb47c1cda2770360f7f674aaf8f2
-  data.tar.gz: 546c4a4f92b78779b0595f98588f1a7b9394c4329ba0eb0b5ab1b86d2e37656d87aeac9d4881a3bcd325e3985ab75784503884831e79e38c5e61aa5026e30983
+  metadata.gz: a88d05eac975d08d6ad47766300a996740c56e7a273488c7ec4e3f59729841d3edf132d91740a82410b7e60aff8017fb5aeabd15095b7ea0673f3088d08dd49f
+  data.tar.gz: b78e868ec797f8c2bdb01e0afc7214e60b7a134414a06b15cc2151e8fcee62e6a59cfcbdde6898af22bb38a3742f4af433187b0e3aaa323c6dd85f956df3f012

data/DEMO.md

@@ -7,7 +7,7 @@ Rails provides a _smoke test_ for new applications that makes sure that you have
 ```bash
 rails new demo --minimal
 cd demo
-echo 'Rails.application.routes.draw { root "rails/welcome#index" }' > config/routes.rb
+echo 'Rails.application.routes.draw { root "rails/welcome#index" }' >> config/routes.rb
 bundle add dockerfile-rails --optimistic --group development
 bin/rails generate dockerfile
 docker buildx build . -t rails-demo

data/lib/generators/dockerfile_generator.rb

@@ -333,10 +333,10 @@ class DockerfileGenerator < Rails::Generators::Base
 
     if fix_database_config
       template "database.yml.erb", "config/database.yml",
-        force: File.exist?("fly.toml")
+        force: options.force? || File.exist?("fly.toml")
     end
 
-    if using_solidq? && deploy_database == "sqlite3" && File.exist?("config/puma.rb")
+    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
 
@@ -421,20 +421,12 @@ class DockerfileGenerator < Rails::Generators::Base
       end
 
       if File.exist?("fly.toml")
-        env = {}
-
-        if (options.sqlite3? || @sqlite3) && !dockerfile.include?("DATABASE_URL")
-          env["DATABASE_URL"] = "sqlite3:///data/production.sqlite3"
-        end
-
-        if using_thruster? && !dockerfile.include?("HTTP_PORT")
-          env["HTTP_PORT"] = "8080"
-        end
+        env = fly_toml_env
 
         unless env.empty?
           toml = IO.read("fly.toml")
-          if !toml.include?("[[env]]")
-            toml += "\n[[env]]\n" + env.map { |key, value| "  #{key} = #{value.inspect}" }.join("\n")
+          if !toml.include?("[env]")
+            toml += "\n[env]\n" + env.map { |key, value| "  #{key} = #{value.inspect}" }.join("\n") + "\n"
             File.write "fly.toml", toml
           end
         end
@@ -550,6 +542,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
@@ -990,6 +998,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
@@ -1216,23 +1228,35 @@ 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?
-      {
-        rails: "bundle exec thrust ./bin/rails server"
-      }
+      if File.exist? "bin/thrust"
+        base = {
+          rails: "./bin/thrust ./bin/rails server"
+        }
+      else
+        base = {
+          rails: "bundle exec thrust ./bin/rails server"
+        }
+      end
     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?
@@ -1241,7 +1265,7 @@ private
 
   def fly_processes
     return unless File.exist? "fly.toml"
-    return unless using_sidekiq? || using_solidq?
+    return unless using_sidekiq? || using_solidq? || using_thruster?
 
     if procfile.size > 1
       list = { "app" => "foreman start --procfile=Procfile.prod" }
@@ -1405,11 +1429,45 @@ private
     end
   end
 
+  def fly_toml_env
+    env = {}
+    dockerfile = File.read("Dockerfile") rescue ""
+
+    if using_thruster?
+      env["PORT"] = "8080"
+    end
+
+    if (options.sqlite3? || @sqlite3) && !dockerfile.include?("DATABASE_URL")
+      env["DATABASE_URL"] = "sqlite3:///data/production.sqlite3"
+    end
+
+    if using_thruster? # && !dockerfile.include?("HTTP_PORT")
+      # env["HTTP_PORT"] = "8080"
+      env["PORT"] = "8080"
+    end
+
+    if solidq_launcher == :env && !dockerfile.include?("SOLID_QUEUE_IN_PUMA")
+      env["SOLID_QUEUE_IN_PUMA"] = "true"
+    end
+
+    env
+  end
+
   def fly_make_toml
     toml = File.read("fly.toml")
+    env = fly_toml_env
+
+    unless env.empty? || toml.include?("[env]")
+      toml += "\n[env]\n" + env.map { |key, value| "  #{key} = #{value.inspect}" }.join("\n") + "\n"
+    end
 
     list = fly_processes
     if list
+      if using_thruster?
+        primary = list.keys.first
+        list[primary] = list[primary].sub(/^.*thrust /, "")
+      end
+
       if toml.include? "[processes]"
         toml.sub!(/\[processes\].*?(\n\n|\n?\z)/m, "[processes]\n" +
           list.map { |name, cmd| "  #{name} = #{cmd.inspect}" }.join("\n") + '\1')
@@ -1434,7 +1492,14 @@ private
 
     if deploy_database == "sqlite3"
       if not toml.include? "[mounts]"
-        toml += "[mounts]\n  source=\"data\"\n  destination=\"/data\"\n\n"
+        toml += <<~EOF + "\n"
+          [mounts]
+            source = "data"
+            destination = "/data"
+            auto_extend_size_threshold = 80
+            auto_extend_size_increment = "1GB"
+            auto_extend_size_limit = "10GB"
+        EOF
       end
     end
 

data/lib/generators/templates/Dockerfile.erb

@@ -303,7 +303,7 @@ EXPOSE <%= using_thruster? ? '80' : '3000' %>
 <% if deploy_database == 'sqlite3' -%>
 VOLUME /data
 <% end -%>
-<% unless fly_processes -%>
+<% unless fly_processes && !using_thruster? -%>
 <% if !options.procfile.blank? -%>
 CMD ["foreman", "start", "--procfile=<%= options.procfile %>"]
 <% elsif procfile.size > 1 -%>

data/lib/generators/templates/docker-compose.yml.erb

@@ -91,7 +91,7 @@ services:
   redis-db:
     image: redis
 <% end -%>
-<% if (using_sidekiq? or using_solidq?) and deploy_database != 'sqlite3' -%>
+<% if (using_sidekiq? and deploy_database != 'sqlite3') or solidq_launcher == :process -%>
 
   <%= using_sidekiq? ? "sidekiq" : "solidq" %>:
     build: .

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.23
+  version: 1.6.25
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-02 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,7 +37,6 @@ files:
 - Rakefile
 - lib/dockerfile-rails.rb
 - lib/dockerfile-rails/scanner.rb
-- lib/fly_replay.rb
 - lib/generators/dockerfile_generator.rb
 - lib/generators/templates/Dockerfile.erb
 - lib/generators/templates/_apt_install.erb

data/lib/fly_replay.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Fly
-  class FlyReplay
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      # replay /prometheus/* to the prom proxy in bubblegum
-      if env["PATH_INFO"].starts_with?("/prometheus")
-        return [307, { "Fly-Replay" => "app=flyio-bubblegum-api" }, []]
-      end
-
-      # replay /debug to the debug app. unsure if this is actually used
-      if env["PATH_INFO"].starts_with?("/debug")
-        return [307, { "Fly-Replay" => "app=debug" }, []]
-      end
-
-      @status, @headers, @response = @app.call(env)
-
-      context = OpenTelemetry::Trace.current_span.context
-      @headers["fly-trace-id"] = context.trace_id.unpack1("H*")
-      @headers["fly-span-id"] = context.span_id.unpack1("H*")
-
-      [@status, @headers, @response]
-    end
-  end
-end