dockerfile-rails 1.6.18 → 1.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06001664944f094c87433a52a0dcdb69fe820682478861d502923676e26f3c73'
-  data.tar.gz: 4189db8d30eefd52ddf399368f60ea63d940325f143c506304f257b87301b508
+  metadata.gz: 770d93b1bee2aa9cec4832a7a03b6c3ed8ccbfb82ca6c19a28959ab38f5f4501
+  data.tar.gz: d19ba2048b0c6d2f5d92506ab29dd2c06bdf106d782b4ce3ca45d41c079306a0
 SHA512:
-  metadata.gz: 46e8f29cdfdfd8b16feb8392e65c57e4d5a6ea60e2b596273f1c2af43cb4cb88ac969b0a25a2702e35c6c29422e5e557046aa30a1f9c12df3b1b8663d747c159
-  data.tar.gz: 417cd9a7715a2769c9060f9f2438f6486a06362c662a9ea3dc254f2d842b5120e0fea78661eab18f2cc00529b2db5a0a18be5a44055d29e84f7cbca57ceeb009
+  metadata.gz: 9dab86fe342a82d18911f2a1fc2d7ec5de69f3b7b3326f1ea9c9fb2945049dbcdd39ac9c125ab524997c16af6f1422b0d73062dfd80ff13044a79b7f0e81996e
+  data.tar.gz: ef62d1ff9359b3e702c0e5a914e39edeeb594bf5c3cc9f5ff2ac8564b974e5ae2bd753f4949d69353a8caf5cdb2ed220daa27255589b0c8f991b60cefd4dbb47

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

@@ -331,6 +331,8 @@ class DockerfileGenerator < Rails::Generators::Base
 
     template "docker-compose.yml.erb", "docker-compose.yml" if options.compose
 
+    template "database.yml.erb", "config/database.yml" if fix_database_config
+
     if using_litefs?
       template "litefs.yml.erb", "config/litefs.yml"
 
@@ -1450,4 +1452,31 @@ private
 
     toml
   end
+
+  # if there are multiple production databases defined, allow them all to be
+  # configured via DATABASE_URL.
+  def fix_database_config
+    yaml = IO.read("config/database.yml")
+
+    production = YAML.load(yaml, aliases: true)["production"]
+    return unless production.is_a?(Hash) && production.values.all?(Hash)
+    return if production.keys == [ "primary" ]
+
+    section = yaml[/^(production:.*?)(^\S|\z)/m, 1]
+
+    replacement = section.gsub(/(  ).*?\n((\1\s+).*?\n)*/) do |subsection|
+      spaces = $3
+      name = subsection[/\w+/]
+
+      if /^ +url:/.match?(subsection)
+        subsection
+      elsif name == "primary"
+        subsection + spaces + %(url: <%= ENV["DATABASE_URL"] %>\n)
+      else
+        subsection + spaces + %(url: <%= URI.parse(ENV["DATABASE_URL"]).tap { |url| url.path += "_#{name}" } if ENV["DATABASE_URL"] %>\n)
+      end
+    end
+
+    yaml.sub(section, replacement)
+  end
 end

data/lib/generators/templates/database.yml.erb

@@ -0,0 +1 @@
+<%= fix_database_config %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.18
+  version: 1.6.19
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-23 00:00:00.000000000 Z
+date: 2024-09-25 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
@@ -45,6 +46,7 @@ files:
 - lib/generators/templates/_node_client.erb
 - lib/generators/templates/_npm_install.erb
 - lib/generators/templates/_passenger.erb
+- lib/generators/templates/database.yml.erb
 - lib/generators/templates/docker-compose.yml.erb
 - lib/generators/templates/docker-entrypoint.erb
 - lib/generators/templates/dockerfile.yml.erb
@@ -74,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: Dockerfile generator for Rails