dockerfile-rails 1.6.24 → 1.6.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d63730b1e3ff8ac7968202d2511f66b51f2faa890350ab71b7f553538aebaae
-  data.tar.gz: f5b546990dbdcc931c5cac7ace90c7219b2af280271c8650b82dc23a33f3ac76
+  metadata.gz: 749745baff7e3b0f67b72f9f94c2df9086c344c9665e2d67498c02c33cfbcbab
+  data.tar.gz: 1b62d4bcf87fd0872057ee0e796b8f529a3b29b811e13447e7ac7df60961ab80
 SHA512:
-  metadata.gz: be28e7ce7e16ea25334727debb71c212bf976fcc602863479ee9ea908849939a9e9ce3e6acbfbd5bfb1ae3c5d0d768c448f8bacfc321543a5fe9a8dd93a55634
-  data.tar.gz: 2e4236bcc182926d0667bc0ff69e24e3034985cce89c0a99690da808029a20d1a1e9bec982d15ed273b877bd374819d490feb76fe46a61478f2e7b98473de6b7
+  metadata.gz: a88d05eac975d08d6ad47766300a996740c56e7a273488c7ec4e3f59729841d3edf132d91740a82410b7e60aff8017fb5aeabd15095b7ea0673f3088d08dd49f
+  data.tar.gz: b78e868ec797f8c2bdb01e0afc7214e60b7a134414a06b15cc2151e8fcee62e6a59cfcbdde6898af22bb38a3742f4af433187b0e3aaa323c6dd85f956df3f012

data/DEMO.md

@@ -7,7 +7,7 @@ Rails provides a _smoke test_ for new applications that makes sure that you have
 ```bash
 rails new demo --minimal
 cd demo
-echo 'Rails.application.routes.draw { root "rails/welcome#index" }' > config/routes.rb
+echo 'Rails.application.routes.draw { root "rails/welcome#index" }' >> config/routes.rb
 bundle add dockerfile-rails --optimistic --group development
 bin/rails generate dockerfile
 docker buildx build . -t rails-demo

data/lib/generators/dockerfile_generator.rb

@@ -333,7 +333,7 @@ class DockerfileGenerator < Rails::Generators::Base
 
     if fix_database_config
       template "database.yml.erb", "config/database.yml",
-        force: File.exist?("fly.toml")
+        force: options.force? || File.exist?("fly.toml")
     end
 
     if solidq_launcher == :puma && !File.read("config/puma.rb").include?(":solid_queue")
@@ -421,24 +421,12 @@ class DockerfileGenerator < Rails::Generators::Base
       end
 
       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
-
-        if solidq_launcher == :env && !dockerfile.include?("SOLID_QUEUE_IN_PUMA")
-          env["SOLID_QUEUE_IN_PUMA"] = "true"
-        end
+        env = fly_toml_env
 
         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")
+          if !toml.include?("[env]")
+            toml += "\n[env]\n" + env.map { |key, value| "  #{key} = #{value.inspect}" }.join("\n") + "\n"
             File.write "fly.toml", toml
           end
         end
@@ -1249,9 +1237,15 @@ private
         rails: "./bin/rails server -p 3001"
       }
     elsif using_thruster?
-      base = {
-        rails: "bundle exec thrust ./bin/rails server"
-      }
+      if File.exist? "bin/thrust"
+        base = {
+          rails: "./bin/thrust ./bin/rails server"
+        }
+      else
+        base = {
+          rails: "bundle exec thrust ./bin/rails server"
+        }
+      end
     else
       base = {
         rails: "./bin/rails server"
@@ -1271,7 +1265,7 @@ private
 
   def fly_processes
     return unless File.exist? "fly.toml"
-    return unless using_sidekiq? || using_solidq?
+    return unless using_sidekiq? || using_solidq? || using_thruster?
 
     if procfile.size > 1
       list = { "app" => "foreman start --procfile=Procfile.prod" }
@@ -1435,11 +1429,45 @@ private
     end
   end
 
+  def fly_toml_env
+    env = {}
+    dockerfile = File.read("Dockerfile") rescue ""
+
+    if using_thruster?
+      env["PORT"] = "8080"
+    end
+
+    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"
+      env["PORT"] = "8080"
+    end
+
+    if solidq_launcher == :env && !dockerfile.include?("SOLID_QUEUE_IN_PUMA")
+      env["SOLID_QUEUE_IN_PUMA"] = "true"
+    end
+
+    env
+  end
+
   def fly_make_toml
     toml = File.read("fly.toml")
+    env = fly_toml_env
+
+    unless env.empty? || toml.include?("[env]")
+      toml += "\n[env]\n" + env.map { |key, value| "  #{key} = #{value.inspect}" }.join("\n") + "\n"
+    end
 
     list = fly_processes
     if list
+      if using_thruster?
+        primary = list.keys.first
+        list[primary] = list[primary].sub(/^.*thrust /, "")
+      end
+
       if toml.include? "[processes]"
         toml.sub!(/\[processes\].*?(\n\n|\n?\z)/m, "[processes]\n" +
           list.map { |name, cmd| "  #{name} = #{cmd.inspect}" }.join("\n") + '\1')
@@ -1464,7 +1492,14 @@ private
 
     if deploy_database == "sqlite3"
       if not toml.include? "[mounts]"
-        toml += "[mounts]\n  source=\"data\"\n  destination=\"/data\"\n\n"
+        toml += <<~EOF + "\n"
+          [mounts]
+            source = "data"
+            destination = "/data"
+            auto_extend_size_threshold = 80
+            auto_extend_size_increment = "1GB"
+            auto_extend_size_limit = "10GB"
+        EOF
       end
     end
 

data/lib/generators/templates/Dockerfile.erb

@@ -303,7 +303,7 @@ EXPOSE <%= using_thruster? ? '80' : '3000' %>
 <% if deploy_database == 'sqlite3' -%>
 VOLUME /data
 <% end -%>
-<% unless fly_processes -%>
+<% unless fly_processes && !using_thruster? -%>
 <% if !options.procfile.blank? -%>
 CMD ["foreman", "start", "--procfile=<%= options.procfile %>"]
 <% elsif procfile.size > 1 -%>

data/lib/generators/templates/docker-compose.yml.erb

@@ -91,7 +91,7 @@ services:
   redis-db:
     image: redis
 <% end -%>
-<% if (using_sidekiq? or using_solidq?) and deploy_database != 'sqlite3' -%>
+<% if (using_sidekiq? and deploy_database != 'sqlite3') or solidq_launcher == :process -%>
 
   <%= using_sidekiq? ? "sidekiq" : "solidq" %>:
     build: .

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.24
+  version: 1.6.25
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-04 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails