dockerfile-rails 1.6.18 → 1.6.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06001664944f094c87433a52a0dcdb69fe820682478861d502923676e26f3c73'
-  data.tar.gz: 4189db8d30eefd52ddf399368f60ea63d940325f143c506304f257b87301b508
+  metadata.gz: 97b00e2bf3497486dd4bde825bdf67c805f9e4f5293a7c9ba279ae559324f4a1
+  data.tar.gz: 1a1cb3c9fbadc0d6e28b332a9d5bdadb4354aa8a6924dccc353dfd698eb68d82
 SHA512:
-  metadata.gz: 46e8f29cdfdfd8b16feb8392e65c57e4d5a6ea60e2b596273f1c2af43cb4cb88ac969b0a25a2702e35c6c29422e5e557046aa30a1f9c12df3b1b8663d747c159
-  data.tar.gz: 417cd9a7715a2769c9060f9f2438f6486a06362c662a9ea3dc254f2d842b5120e0fea78661eab18f2cc00529b2db5a0a18be5a44055d29e84f7cbca57ceeb009
+  metadata.gz: 2c916667f7f12930ede3c0279a852a7f32d2433f69acd69626630a71de2d206b5f36f9448ccf7db09097684f718ce29899741a442e506027fd260efc7b489095
+  data.tar.gz: 7f96dc124502e009d955e4886d0848775e962ccd935f165b4c71d6abc50e889b0f04da64ca0844038a913606b36dca33068f4bbb08e54c22343e05eba87c9a81

data/README.md

@@ -52,7 +52,7 @@ different contents.  If both are specified, `--force` takes precedence.
 * `--max-idle=n` - exit afer *n* seconds of inactivity.  Supports [iso 8601](https://en.wikipedia.org/wiki/ISO_8601#Durations) and [sleep](https://man7.org/linux/man-pages/man1/sleep.1.html#DESCRIPTION) syntaxes.  Uses passenger for now, awaiting [puma](https://github.com/puma/puma/issues/2580) support.
 * `--nginx` - serve static files via [nginx](https://www.nginx.com/).  May require `--root` on some targets to access `/dev/stdout`
 * `--thruster` - serve static files via [thruster](https://github.com/basecamp/thruster?tab=readme-ov-file#thruster).
-* `--no-link` - don't add [--link](https://docs.docker.com/engine/reference/builder/#copy---link) to COPY statements.  Some tools (like at the moment, [buildah](https://www.redhat.com/en/topics/containers/what-is-buildah)) don't yet support this feature.
+* `--link` - add [--link](https://docs.docker.com/engine/reference/builder/#copy---link) to COPY statements.  Some tools (like at the moment, [buildah](https://www.redhat.com/en/topics/containers/what-is-buildah)) don't yet support this feature.
 * `--no-lock` - don't add linux platforms, set `BUNDLE_DEPLOY`, or `--frozen-lockfile`.  May be needed at times to work around a [rubygems bug](https://github.com/rubygems/rubygems/issues/6082#issuecomment-1329756343).
 * `--sudo` - install and configure sudo to enable `sudo -iu rails` access to full environment
 

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

@@ -17,7 +17,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "gemfile-updates" => true,
     "jemalloc" => false,
     "label" => {},
-    "link" => true,
+    "link" => false,
     "litefs" => false,
     "lock" => true,
     "max-idle" => nil,
@@ -117,7 +117,7 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :ci, type: :boolean, default: OPTION_DEFAULTS.ci,
     desc: "include test gems in bundle"
 
-  class_option :link, type: :boolean, default: OPTION_DEFAULTS.lock,
+  class_option :link, type: :boolean, default: OPTION_DEFAULTS.link,
     desc: "use COPY --link whenever possible"
 
   class_option :lock, type: :boolean, default: OPTION_DEFAULTS.lock,
@@ -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"
 
@@ -522,7 +524,7 @@ private
   end
 
   def using_sidekiq?
-    @gemfile.include?("sidekiq") and includes_jobs?
+    @gemfile.include?("sidekiq")
   end
 
   def using_solidq?
@@ -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.20
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-23 00:00:00.000000000 Z
+date: 2024-09-26 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