dockerfile-rails 1.6.12 → 1.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2166500bf8ebbd97df50dec8e206c6233414fb6310a9369693664fa662927acc
-  data.tar.gz: 751a16215549914f56b91330b5c8168916efe276dc290090ea44ca357d6af66c
+  metadata.gz: 2531120f4d41adf0dd6616bd2402b96236bbe88d29bb4ce68540807fe90ee9d7
+  data.tar.gz: 6ce1bd73ea9ff3d999c11e8c0e22f00b4ed3324f5cca1b811b147a101ca9988a
 SHA512:
-  metadata.gz: 32fff3700db3dc21809587ea403e7f8c4ba8fd8ba30321b4f5489419f15b853680dd6ad941b02c17aa0d632451e10a390f9d24f36389cc0a1766019f7a4fcc29
-  data.tar.gz: 8cc6ca30994f5837c9d9728f3c1ee1a0f232fdbc439f345e7827c404e613f46c119a2a2e370f908bba8feb747c9d3a0cbcf55f8f6742657fcc68948823504d5d
+  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
@@ -1169,7 +1178,7 @@ private
         nginx: '/usr/sbin/nginx -g "daemon off;"',
         rails: "./bin/rails server -p 3001"
       }
-    elsif options.thruster? || @gemfile.include?("thruster")
+    elsif using_thruster?
       {
         rails: "bundle exec thrust ./bin/rails server"
       }
@@ -1180,6 +1189,10 @@ private
     end
   end
 
+  def using_thruster?
+    options.thruster? || @gemfile.include?("thruster")
+  end
+
   def fly_processes
     return unless File.exist? "fly.toml"
     return unless using_sidekiq? || using_solidq?

data/lib/generators/templates/Dockerfile.erb

@@ -296,7 +296,7 @@ EOF
 
 <% end -%>
 # Start the server by default, this can be overwritten at runtime
-EXPOSE 3000
+EXPOSE <%= using_thruster? ? '80' : '3000' %>
 <% if deploy_database == 'sqlite3' -%>
 VOLUME /data
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.12
+  version: 1.6.14
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,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