dockerfile-rails 1.6.22 → 1.6.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57f94bd7d0ee06690024d3a5beab4dc55bc02efcd8ccd390d5ba24e046cef2f
-  data.tar.gz: e6d155a91c132c60a214159668ba4998d20bbb5ad3192d852c4377eed43d72e3
+  metadata.gz: 470ee4a04d8cdca1cb340ac2c1b72bf5948900e50ad7a500e496ea8659e7b848
+  data.tar.gz: 16cc734ca04cb5e3c514135b130880ff1abf373ae4a415692aafdf723b5e6458
 SHA512:
-  metadata.gz: ac80ebf094d7ac05106cbc7680a56452c5bca6c7d30c4a30ccb32f5e43042d50139e997a7866233c51d8c38234cf3568f06c4eafb2a3d281391a4379da256df4
-  data.tar.gz: 7bb349afdf55b80f8495c1034bc5b490fddc2488b110b219ffcb878f67c51c50720ec168340a72b3e5ec9854d4f97af77e3ed7ae23ae0e25d6678c901b75ea75
+  metadata.gz: c3d1dd01ab68286af66e8ab402dbb1e2d5b47a4d1841608d6a5d343bb9c3940b8cafe0e94439ee7621caa658deb70742a79bcb47c1cda2770360f7f674aaf8f2
+  data.tar.gz: 546c4a4f92b78779b0595f98588f1a7b9394c4329ba0eb0b5ab1b86d2e37656d87aeac9d4881a3bcd325e3985ab75784503884831e79e38c5e61aa5026e30983

data/lib/fly_replay.rb

@@ -0,0 +1,29 @@
+# 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

data/lib/generators/dockerfile_generator.rb

@@ -336,6 +336,10 @@ class DockerfileGenerator < Rails::Generators::Base
         force: File.exist?("fly.toml")
     end
 
+    if using_solidq? && deploy_database == "sqlite3" && File.exist?("config/puma.rb")
+      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"
 
@@ -1248,7 +1252,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 +1285,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.23
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,6 +37,7 @@ 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