dockerfile-rails 1.7.2 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f84375d1c8998624a5d16ba70535780b3bd106686f028ac3e2927f2257dfee01
-  data.tar.gz: c6267e02136d4a7a261375f85bf539d576e81b9207dbd19a90e6e56a8005dde5
+  metadata.gz: be3d1ce9566496c167fba7241e1f1e07ed7efbad7945c6a86d3ff282bb1b8229
+  data.tar.gz: 27f6342c3e4cc7bc92195139347938d75bc0cf0b77bfc53627cbfd7611b149b4
 SHA512:
-  metadata.gz: 66aa85b281ec6f6a843dfcde0846e325ebcb773d4d37094679dabc41ac362dfbe5b707606e41ea1bfda1c32602b16471deafc539f6bd461c3af0b33df139422f
-  data.tar.gz: fac91494b06978ff7b3a9c76eac4e9c53d9364b2461f0a8d9a1d26acb55dfef46747cc7d0b38f17ca33bc28be778c9c29e3f397ed79c2778f7afd2a1b6a648c7
+  metadata.gz: 6bb0a8358622932c93120e5779b6eb3b43b5e7b2b10fb292ede16303800189322b2c56ea86a539fc79803c6fd2ea07c328266e00a3ab6ecfaeab8a00cfdf9550
+  data.tar.gz: a66522cf4672acbbb377ee85feb42cab5443300df5fc2327a1c8034cc4f3bf49665f7d16612ebf02c719c27213f2652c372352c002ed0e4ee030f2b74361aab6

data/lib/generators/dockerfile_generator.rb

@@ -72,7 +72,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "libsqlite3-0" => "sqlite-dev",
     "libtiff-dev" => "tiff-dev",
     "libjemalloc2" => "jemalloc",
-    "libvips" => "vips-dev",
+    "libvips" => "vips",
     "libyaml-dev" => "yaml-dev",
     "node-gyp" => "gyp",
     "pkg-config" => "pkgconfig",
@@ -511,7 +511,7 @@ private
 
   def using_bun?
     return @using_bun if @using_bun != nil
-    @using_bun = File.exist?("bun.config.js") || File.exist?("bun.lockb")
+    @using_bun = File.exist?("bun.config.js") || File.exist?("bun.lockb") || File.exist?("bun.lock")
   end
 
   def references_ruby_version_file?
@@ -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

data/lib/generators/templates/_apt_install.erb

@@ -2,6 +2,8 @@
 RUN <%= pkg_cache.map {|name, path| "--mount=type=cache,id=#{name},sharing=locked,target=#{path} \\"}.join("\n    ") %>
     <%= repos %><%= pkg_update %> && \
     <%= pkg_install %> <%= packages.join(" ") %>
+<% elsif options.alpine? && clean -%>
+RUN apk add --no-cache <%= packages.join(" ") %>
 <% else -%>
 RUN <%= repos %><%= pkg_update %> && \
     <%= pkg_install %> <%= packages.join(" ") %><% if clean %> && \

metadata

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