dockerfile-rails 1.6.13 → 1.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e248008553d63dc5b088dadfa1e79620d4f2db08f67bd67506a5f8a0421b973
-  data.tar.gz: de2ded8ae1828b7db4812fc9082928c9d4d57caf3ed4aa965134c2dec76dcb83
+  metadata.gz: 2531120f4d41adf0dd6616bd2402b96236bbe88d29bb4ce68540807fe90ee9d7
+  data.tar.gz: 6ce1bd73ea9ff3d999c11e8c0e22f00b4ed3324f5cca1b811b147a101ca9988a
 SHA512:
-  metadata.gz: 8763575bc2a8d064e2ee20d3f6add987d81fede3656ba1f8c8b38c0f6808c8448ca31ca4e362ddac9bf275c38c10cb6baf0bbd113a842726623cff7a63b379c1
-  data.tar.gz: f54366d61f5f18d0db311922c5acae95950c5e56d6b56d262a93486c0019e29ac88744035d670eded6a2a08353a24c1a1f4093fdea38ba61a439322373c8dc22
+  metadata.gz: 300bf0e817f27b0f4972333d87bbe1b322c866e8e3eeaf5eb4bd689f69a584b992ecdf9c5d93299130cef292bf3666a637f353658a744593ef7e32b3f381f7fd
+  data.tar.gz: c71043dc03cea93277164bc4ad4aa4e37712b76df6c40f65883bead0a8503f125f3a5f904c594ce8b6d26873a86fbee6b11deb2f0f58bc6daa2a1d9c106f514b

data/lib/generators/dockerfile_generator.rb

@@ -372,7 +372,8 @@ class DockerfileGenerator < Rails::Generators::Base
       remove_file "config/dockerfile.yml"
     end
 
-    # check Dockerfile for common errors: missing packages, mismatched Ruby version
+    # check Dockerfile for common errors: missing packages, mismatched Ruby version;
+    # also add DATABASE_URL to fly.toml if needed
     if options.skip? && File.exist?("Dockerfile")
       message = nil
       shell = Thor::Base.shell.new
@@ -393,6 +394,14 @@ class DockerfileGenerator < Rails::Generators::Base
         STDERR.puts "\n" + shell.set_color(message, Thor::Shell::Color::RED, Thor::Shell::Color::BOLD)
       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
+        end
+      end
+
       exit 42 if message
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.13
+  version: 1.6.14
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2024-05-27 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
@@ -75,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.10
 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