dockerfile-rails 1.6.20 → 1.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97b00e2bf3497486dd4bde825bdf67c805f9e4f5293a7c9ba279ae559324f4a1
-  data.tar.gz: 1a1cb3c9fbadc0d6e28b332a9d5bdadb4354aa8a6924dccc353dfd698eb68d82
+  metadata.gz: b937cd3cb1aac852332cec69d74844548ec84a2a891cf46effd2a1e8ebbbba39
+  data.tar.gz: e4038b8e3c87c7ff294d1272c4ff5bd2f59fd0247ab9f5da860994baf50fbbd1
 SHA512:
-  metadata.gz: 2c916667f7f12930ede3c0279a852a7f32d2433f69acd69626630a71de2d206b5f36f9448ccf7db09097684f718ce29899741a442e506027fd260efc7b489095
-  data.tar.gz: 7f96dc124502e009d955e4886d0848775e962ccd935f165b4c71d6abc50e889b0f04da64ca0844038a913606b36dca33068f4bbb08e54c22343e05eba87c9a81
+  metadata.gz: 7af874f91e9b92a374f628cb822e5513827a65511631b5c9678c90183dd33f252037cb03e02ef20c5b121014ad09413088da73969b6d8ca2bb88e6d2791417d5
+  data.tar.gz: c600be2fcc77d4228ffa6d8acc3e5d3ce342576be8f4f986bc3e0fbe4022f2f9f3911c5be83c3e96548c3445680f830837cbe230c663cc16d72f94758f9541ce

data/lib/generators/dockerfile_generator.rb

@@ -331,7 +331,10 @@ 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 fix_database_config
+      template "database.yml.erb", "config/database.yml",
+        force: File.exist?("fly.toml")
+    end
 
     if using_litefs?
       template "litefs.yml.erb", "config/litefs.yml"
@@ -413,11 +416,23 @@ class DockerfileGenerator < Rails::Generators::Base
         STDERR.puts 'RUN sed -i "/net-pop (0.1.2)/a\      net-protocol" Gemfile.lock'
       end
 
-      if (options.sqlite3? || @sqlite3) && !dockerfile.include?("DATABASE_URL") && File.exist?("fly.toml")
-        toml = IO.read("fly.toml")
-        if !toml.include?("[[env]]")
-          toml += "\n[[env]]\n  DATABASE_URL = \"sqlite3:///data/production.sqlite3\"\n"
-          File.write "fly.toml", toml
+      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
+
+        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")
+            File.write "fly.toml", toml
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.20
+  version: 1.6.21
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 2024-09-30 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
@@ -76,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Dockerfile generator for Rails

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