dockerfile-rails 1.6.12 → 1.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2166500bf8ebbd97df50dec8e206c6233414fb6310a9369693664fa662927acc
-  data.tar.gz: 751a16215549914f56b91330b5c8168916efe276dc290090ea44ca357d6af66c
+  metadata.gz: 6e248008553d63dc5b088dadfa1e79620d4f2db08f67bd67506a5f8a0421b973
+  data.tar.gz: de2ded8ae1828b7db4812fc9082928c9d4d57caf3ed4aa965134c2dec76dcb83
 SHA512:
-  metadata.gz: 32fff3700db3dc21809587ea403e7f8c4ba8fd8ba30321b4f5489419f15b853680dd6ad941b02c17aa0d632451e10a390f9d24f36389cc0a1766019f7a4fcc29
-  data.tar.gz: 8cc6ca30994f5837c9d9728f3c1ee1a0f232fdbc439f345e7827c404e613f46c119a2a2e370f908bba8feb747c9d3a0cbcf55f8f6742657fcc68948823504d5d
+  metadata.gz: 8763575bc2a8d064e2ee20d3f6add987d81fede3656ba1f8c8b38c0f6808c8448ca31ca4e362ddac9bf275c38c10cb6baf0bbd113a842726623cff7a63b379c1
+  data.tar.gz: f54366d61f5f18d0db311922c5acae95950c5e56d6b56d262a93486c0019e29ac88744035d670eded6a2a08353a24c1a1f4093fdea38ba61a439322373c8dc22

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

@@ -1169,7 +1169,7 @@ private
         nginx: '/usr/sbin/nginx -g "daemon off;"',
         rails: "./bin/rails server -p 3001"
       }
-    elsif options.thruster? || @gemfile.include?("thruster")
+    elsif using_thruster?
       {
         rails: "bundle exec thrust ./bin/rails server"
       }
@@ -1180,6 +1180,10 @@ private
     end
   end
 
+  def using_thruster?
+    options.thruster? || @gemfile.include?("thruster")
+  end
+
   def fly_processes
     return unless File.exist? "fly.toml"
     return unless using_sidekiq? || using_solidq?

data/lib/generators/templates/Dockerfile.erb

@@ -296,7 +296,7 @@ EOF
 
 <% end -%>
 # Start the server by default, this can be overwritten at runtime
-EXPOSE 3000
+EXPOSE <%= using_thruster? ? '80' : '3000' %>
 <% if deploy_database == 'sqlite3' -%>
 VOLUME /data
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.12
+  version: 1.6.13
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-05-16 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