dockerfile-rails 1.7.3 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45a9050bf01761b7e8542d0a5a98b757ba10ad8237169a2c5adde8ef0defb68b
-  data.tar.gz: ef2572435e69a2a38bbc40c1b7c5f6e8b2be9e68148be509d382b4f02f327e4d
+  metadata.gz: d70002b918b2110952ebace8ba264db76189fe7f5a27b1985313871e9318af8f
+  data.tar.gz: 9cd5e7a99158113277978a9787cb099ba002d35d2dfaef2fba58d9abf1a67225
 SHA512:
-  metadata.gz: bf4676f2c8b5f2eb9a41c52d9ec7b48527ed90b1659f8786b70518fee5961ab0f7762577893acc6266de2830d658a0385d3385fd989bce7de32b12826326b0df
-  data.tar.gz: 9547ff75541f16a457368d51bd3840f6e318e87dfa35a12c8db7b71928920ca5f6e1ee64b53a9d0e38fe565a4f49eb9cc4de608e2eb6b0391373f662a05bb920
+  metadata.gz: 93bc70acc19970a2813bfcd9e56138dd3216ea6998e8a883cff27a305e8cd2a6694a750333249e1367eea05b37edccc2183f2a1d09b2fc1f8f65428d66f38af4
+  data.tar.gz: 13f8868fbc6e5e09be03e3f323c9093e136b5b93d760d883d94057138f8e8c92ffd04841a5963a4c08175a011f03a44998ed7a396c2861da890ac4d3a6d8f001

data/lib/generators/dockerfile_generator.rb

@@ -515,7 +515,12 @@ private
   end
 
   def references_ruby_version_file?
-    @references_ruby_version_file ||= IO.read("Gemfile").include?(".ruby-version")
+    @references_ruby_version_file ||= ruby_version_file.present?
+  end
+
+  def ruby_version_file
+    match = IO.read("Gemfile").match(/ruby file: ["'](.*)["']/)
+    match ? match[1] : nil
   end
 
   def using_redis?
@@ -1255,7 +1260,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 +1605,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

@@ -9,7 +9,7 @@
 # For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html
 <% end -%>
 
-# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
+# Make sure RUBY_VERSION matches the Ruby version in <%= ruby_version_file || '.ruby-version' %>
 ARG RUBY_VERSION=<%= RUBY_VERSION %>
 <% if api_client_dir -%>
 <%= render partial: 'node_client' %>
@@ -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
@@ -95,7 +95,7 @@ ENV <%= build_env.join(" \\\n    ") %>
 
 <% end -%>
 # Install application gems
-COPY<% if options.link? %> --link<% end %> Gemfile Gemfile.lock <% if references_ruby_version_file? %>.ruby-version <% end %>./
+COPY<% if options.link? %> --link<% end %> Gemfile Gemfile.lock <% if references_ruby_version_file? %><%= ruby_version_file %> <% end %>./
 <% if @netpopbug && Rails.env != "test" -%>
 RUN sed -i "/net-pop (0.1.2)/a\      net-protocol" Gemfile.lock
 <% end -%>
@@ -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.5
 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