dockerfile-rails 1.6.14 → 1.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2531120f4d41adf0dd6616bd2402b96236bbe88d29bb4ce68540807fe90ee9d7
-  data.tar.gz: 6ce1bd73ea9ff3d999c11e8c0e22f00b4ed3324f5cca1b811b147a101ca9988a
+  metadata.gz: 408907e489bd861b56cdbf73efa0213276ffee3cd1edaab526e3e978325d6bb1
+  data.tar.gz: afedfb85e018faf90a4a84b712d0b0e8060e7c898868b02499a0bd87bce81984
 SHA512:
-  metadata.gz: 300bf0e817f27b0f4972333d87bbe1b322c866e8e3eeaf5eb4bd689f69a584b992ecdf9c5d93299130cef292bf3666a637f353658a744593ef7e32b3f381f7fd
-  data.tar.gz: c71043dc03cea93277164bc4ad4aa4e37712b76df6c40f65883bead0a8503f125f3a5f904c594ce8b6d26873a86fbee6b11deb2f0f58bc6daa2a1d9c106f514b
+  metadata.gz: a90b5fa2032eb15f8dacb12ccbe1f4fc711f8ebdd4a4f90b24291d146af948413783b484c3bc0054614e7deb9f5acff5a90cf9da96f1d86f9481b85146debf2b
+  data.tar.gz: d3db627db5dab2c89517cd8eaf34e66dbadb4b17ae43b5533fd4e6430e4372cc09f7ebb509c509281954cd1896fc42713947d2aec631557955a7488e52f562ee

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

@@ -42,6 +42,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "sentry" => false,
     "sudo" => false,
     "swap" => nil,
+    "tigris" => false,
     "thruster" => false,
     "variant" => nil,
     "windows" => false,
@@ -161,6 +162,9 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :litefs, type: :boolean, default: OPTION_DEFAULTS.litefs,
     desc: "replicate sqlite3 databases using litefs"
 
+  class_option :tigris, type: :boolean, default: OPTION_DEFAULTS.tigris,
+    desc: "configure active storage to use tigris"
+
   class_option :postgresql, aliases: "--postgres", type: :boolean, default: OPTION_DEFAULTS.postgresql,
     desc: "include postgresql libraries"
 
@@ -372,6 +376,10 @@ class DockerfileGenerator < Rails::Generators::Base
       remove_file "config/dockerfile.yml"
     end
 
+    if options.tigris?
+      configure_tigris
+    end
+
     # 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")
@@ -548,6 +556,10 @@ private
       system "bundle add redis --skip-install" unless @gemfile.include? "redis"
     end
 
+    if options.tigris?
+      system "bundle add aws-sdk-s3 --require=false --skip-install" unless @gemfile.include? "aws-sdk-s3"
+    end
+
     if options.sentry?
       system "bundle add sentry-ruby --skip-install" unless @gemfile.include? "sentry-ruby"
       system "bundle add sentry-rails --skip-install" unless @gemfile.include? "sentry-rails"
@@ -994,7 +1006,7 @@ private
     instructions = IO.read @@instructions["base"]
 
     if instructions.start_with? "#!"
-      instructions = "# custom instructions\nRUN #{@instructions["base"].strip}"
+      instructions = "# custom instructions\nRUN #{@@instructions["base"].strip}"
     end
 
     instructions.html_safe
@@ -1006,7 +1018,7 @@ private
     instructions = IO.read @@instructions["build"]
 
     if instructions.start_with? "#!"
-      instructions = "# custom build instructions\nRUN #{@instructions["build"].strip}"
+      instructions = "# custom build instructions\nRUN #{@@instructions["build"].strip}"
     end
 
     instructions.html_safe
@@ -1018,7 +1030,7 @@ private
     instructions = IO.read @@instructions["deploy"]
 
     if instructions.start_with? "#!"
-      instructions = "# custom deploy instructions\nRUN #{@instructions["deploy"].strip}"
+      instructions = "# custom deploy instructions\nRUN #{@@instructions["deploy"].strip}"
     end
 
     instructions.html_safe
@@ -1299,6 +1311,49 @@ private
     system "#{flyctl} consul attach"
   end
 
+  def configure_tigris
+    return unless options.tigris?
+
+    service = [
+      "tigris:",
+      "  service: S3",
+      '  access_key_id: <%= ENV["AWS_ACCESS_KEY_ID"] %>',
+      '  secret_access_key: <%= ENV["AWS_SECRET_ACCESS_KEY"] %>',
+      '  endpoint: <%= ENV["AWS_ENDPOINT_URL_S3"] %>',
+      '  bucket: <%= ENV["BUCKET_NAME"] %>'
+    ]
+
+    shell = Thor::Base.shell.new
+
+    if File.exist?("config/storage.yml")
+      storage = IO.read("config/storage.yml")
+      if storage.include? "tigris"
+        STDOUT.puts shell.set_color("unchanged".rjust(12), Thor::Shell::Color::BLUE, Thor::Shell::Color::BOLD) +
+          "  config/storage.yml"
+      else
+        storage = storage.strip + "\n\n" + service.join("\n") + "\n"
+        IO.write("config/storage.yml", storage)
+        STDOUT.puts shell.set_color("updated".rjust(12), Thor::Shell::Color::GREEN, Thor::Shell::Color::BOLD) +
+          "  config/storage.yml"
+      end
+    end
+
+    if File.exist?("config/environments/production.rb")
+      production = IO.read("config/environments/production.rb")
+      if !production.include?("tigris") && production.include?("config.active_storage.service")
+        production.sub!(/config.active_storage.service.*/, "config.active_storage.service = :tigris")
+        production.sub! "# Store uploaded files on the local file system",
+          "# Store uploaded files in Tigris Global Object Storage"
+        IO.write("config/environments/production.rb", production)
+        STDOUT.puts shell.set_color("updated".rjust(12), Thor::Shell::Color::GREEN, Thor::Shell::Color::BOLD) +
+          "  config/environments/production.rb"
+      else
+        STDOUT.puts shell.set_color("unchanged".rjust(12), Thor::Shell::Color::BLUE, Thor::Shell::Color::BOLD) +
+          "  config/environments/production.yml"
+      end
+    end
+  end
+
   def fly_make_toml
     toml = File.read("fly.toml")
 

metadata

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