dockerfile-rails 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45a9050bf01761b7e8542d0a5a98b757ba10ad8237169a2c5adde8ef0defb68b
-  data.tar.gz: ef2572435e69a2a38bbc40c1b7c5f6e8b2be9e68148be509d382b4f02f327e4d
+  metadata.gz: be3d1ce9566496c167fba7241e1f1e07ed7efbad7945c6a86d3ff282bb1b8229
+  data.tar.gz: 27f6342c3e4cc7bc92195139347938d75bc0cf0b77bfc53627cbfd7611b149b4
 SHA512:
-  metadata.gz: bf4676f2c8b5f2eb9a41c52d9ec7b48527ed90b1659f8786b70518fee5961ab0f7762577893acc6266de2830d658a0385d3385fd989bce7de32b12826326b0df
-  data.tar.gz: 9547ff75541f16a457368d51bd3840f6e318e87dfa35a12c8db7b71928920ca5f6e1ee64b53a9d0e38fe565a4f49eb9cc4de608e2eb6b0391373f662a05bb920
+  metadata.gz: 6bb0a8358622932c93120e5779b6eb3b43b5e7b2b10fb292ede16303800189322b2c56ea86a539fc79803c6fd2ea07c328266e00a3ab6ecfaeab8a00cfdf9550
+  data.tar.gz: a66522cf4672acbbb377ee85feb42cab5443300df5fc2327a1c8034cc4f3bf49665f7d16612ebf02c719c27213f2652c372352c002ed0e4ee030f2b74361aab6

data/lib/generators/dockerfile_generator.rb

@@ -1255,7 +1255,7 @@ private
     client = api_client_dir
     return unless client
 
-    Dir["#{client}/{package.json,package-lock.json,yarn.lock,bun.lockb}"]
+    Dir["#{client}/{package.json,package-lock.json,yarn.lock,bun.lockb,bun.lock}"]
   end
 
   def dbprep_command
@@ -1600,7 +1600,7 @@ private
   def fix_database_config
     yaml = IO.read("config/database.yml")
 
-    production = YAML.load(yaml, aliases: true)["production"]
+    production = YAML.load(yaml, aliases: true)["production"] rescue nil
     return unless production.is_a?(Hash) && production.values.all?(Hash)
     return if production.keys == [ "primary" ]
 

data/lib/generators/templates/Dockerfile.erb

@@ -70,7 +70,7 @@ FROM base AS <%= parallel? ? 'pre' : '' %>build
 FROM prebuild AS <% if using_bun? %>bun<% else %>node<% end %>
 
 <% end -%>
-<% if using_bun? and (!using_execjs? || File.exist?('bun.lockb')) -%>
+<% if using_bun? and (!using_execjs? || File.exist?('bun.lockb') || File.exist?('bun.lock')) -%>
 <%= render partial: 'install_node', locals: {bun_version: using_execjs? ? nil : bun_version} %>
 
 <% elsif using_node? and (!using_execjs? || File.exist?('yarn.lock')) -%>
@@ -78,7 +78,7 @@ FROM prebuild AS <% if using_bun? %>bun<% else %>node<% end %>
 
 <% end -%>
 <% if parallel? -%>
-<%= render partial: 'npm_install', locals: {sources: Dir[*%w(package.json yarn.lock bun.lockb)]} %>
+<%= render partial: 'npm_install', locals: {sources: Dir[*%w(package.json yarn.lock bun.lockb bun.lock)]} %>
 
 
 FROM prebuild AS build
@@ -149,7 +149,7 @@ ENV PATH=/usr/local/node/bin:$PATH
 <% end -%>
 
 <% elsif using_node? || using_bun? -%>
-<%= render partial: 'npm_install', locals: {sources: Dir[*%w(.npmrc .yarnrc package.json package-lock.json yarn.lock bun.lockb)]} %>
+<%= render partial: 'npm_install', locals: {sources: Dir[*%w(.npmrc .yarnrc package.json package-lock.json yarn.lock bun.lockb bun.lock)]} %>
 
 <% end -%>
 # Copy application code

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Sam Ruby
 bindir: bin
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+date: 2025-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails