dockerfile-rails 1.6.13 → 1.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e248008553d63dc5b088dadfa1e79620d4f2db08f67bd67506a5f8a0421b973
-  data.tar.gz: de2ded8ae1828b7db4812fc9082928c9d4d57caf3ed4aa965134c2dec76dcb83
+  metadata.gz: 408907e489bd861b56cdbf73efa0213276ffee3cd1edaab526e3e978325d6bb1
+  data.tar.gz: afedfb85e018faf90a4a84b712d0b0e8060e7c898868b02499a0bd87bce81984
 SHA512:
-  metadata.gz: 8763575bc2a8d064e2ee20d3f6add987d81fede3656ba1f8c8b38c0f6808c8448ca31ca4e362ddac9bf275c38c10cb6baf0bbd113a842726623cff7a63b379c1
-  data.tar.gz: f54366d61f5f18d0db311922c5acae95950c5e56d6b56d262a93486c0019e29ac88744035d670eded6a2a08353a24c1a1f4093fdea38ba61a439322373c8dc22
+  metadata.gz: a90b5fa2032eb15f8dacb12ccbe1f4fc711f8ebdd4a4f90b24291d146af948413783b484c3bc0054614e7deb9f5acff5a90cf9da96f1d86f9481b85146debf2b
+  data.tar.gz: d3db627db5dab2c89517cd8eaf34e66dbadb4b17ae43b5533fd4e6430e4372cc09f7ebb509c509281954cd1896fc42713947d2aec631557955a7488e52f562ee

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,7 +376,12 @@ class DockerfileGenerator < Rails::Generators::Base
       remove_file "config/dockerfile.yml"
     end
 
-    # check Dockerfile for common errors: missing packages, mismatched Ruby version
+    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")
       message = nil
       shell = Thor::Base.shell.new
@@ -393,6 +402,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
@@ -539,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"
@@ -985,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
@@ -997,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
@@ -1009,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
@@ -1290,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.13
+  version: 1.6.15
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails