dockerfile-rails 1.7.9 → 1.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e78cc232d1ab5de05f4fc57e07bc912d0523cb8d17b831fd4cb27a9852ae432
-  data.tar.gz: 41560de52e9558d1f6a671ef03c5f13a8cf981be24f4ea3bc1ae7c2c38ddbe01
+  metadata.gz: c87e11cfc7094b0fc07aa8caf44a3fe9dd2eae917faf0f7dece4a63006230370
+  data.tar.gz: 9eea55358ddf5a993d5c5a315f33789f504628bb9839c67448df0a7068ccdeb2
 SHA512:
-  metadata.gz: a4e026820a4cc3f46c7fece5a6702bbc1bc0bdd9a112a1c713e8ba9fb6977398efbbca33b0015f8db3e8dc22a9025f02c157f5994859632555012f933ccee1f5
-  data.tar.gz: 344747d92ef3248dc42b9f180e2f8d0ce405da56a1a3f1a6650bb77e88235b1ef20cd0d20b804139d9167e929d589d6d464ce7e1e708b15418ccdbed6acc82e7
+  metadata.gz: da01082945921ddeebec9e437590e2c83801f9df5da6c6a8bf1b17906d0e97986dde1b008bbb794206f8fd5fbf45463ccbb887ea1d653f588047e641dbff4b41
+  data.tar.gz: 6e5d178956a067f785b494378dc00f4404c9af75fd74030754922aa8687e5779fa89c57f01d1a46caf1938cb04095ce7c3c0415f089a0b03402dcf90aa11b09d

data/README.md

@@ -44,6 +44,7 @@ different contents.  If both are specified, `--force` takes precedence.
 
 * `--cache` - use build caching to speed up builds
 * `--parallel` - use multi-stage builds to install gems and node modules in parallel
+* `--nproc n` - run bundle install in parallel
 
 ### Add/remove a Feature:
 

data/lib/generators/dockerfile_generator.rb

@@ -27,6 +27,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "mysql" => false,
     "nginx" => false,
     "parallel" => false,
+    "nproc" => 1,
     "passenger" => false,
     "platform" => nil,
     "postgresql" => false,
@@ -148,6 +149,9 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :parallel, type: :boolean, default: OPTION_DEFAULTS.parallel,
     desc: "use build stages to install gems and node modules in parallel"
 
+  class_option :nproc, type: :numeric, default: OPTION_DEFAULTS.nproc,
+    desc: "run bundle install in parallel"
+
   class_option :swap, type: :string, default: OPTION_DEFAULTS.swap,
     desc: "allocate swapspace"
 

data/lib/generators/templates/Dockerfile.erb

@@ -96,6 +96,9 @@ 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_file %> <% end %>./
+<% if options.nproc > 1 -%>
+ENV MAKE="make -j<%= options.nproc %>"
+<% end -%>
 <% if @netpopbug && Rails.env != "test" -%>
 RUN sed -i "/net-pop (0.1.2)/a\      net-protocol" Gemfile.lock
 <% end -%>

data/lib/generators/templates/_npm_install.erb

@@ -5,7 +5,7 @@ COPY<% if options.link? %> --link<% end %> .yarn/releases/* .yarn/releases/
 <% end -%>
 <% if using_bun? -%>
 RUN <% if options.cache? %>--mount=type=cache,id=bld-bun-cache,target=/root/.bun \
-    <% end %>bun install<% if options.lock? %> --frozen-lockfile<% end %>
+    <% end %>bun install<% if options.lock? %> --frozen-lockfile<% end %> --production
 <% elsif sources.join.include? 'yarn' -%>
 RUN <% if options.cache? %>--mount=type=cache,id=bld-yarn-cache,target=/root/.yarn \
     YARN_CACHE_FOLDER=/root/.yarn <% end %>yarn install<% if options.lock? %> --<% if yarn_version < '2' -%>frozen-lockfile<% else %>immutable<% end %><% end %>

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

@@ -40,7 +40,7 @@ services:
 <% end -%>
 <% end -%>
     secrets:
-      - source: master_key
+      - source: RAILS_MASTER_KEY
         target: /rails/config/master.key
 <% if using_redis? or deploy_database != 'sqlite3' -%>
     depends_on:
@@ -135,5 +135,5 @@ secrets:
 <% end -%>
 
 secrets:
-  master_key:
-    file: ./config/master.key
+  RAILS_MASTER_KEY
+    file: ./config/master.key

data/lib/generators/templates/litestream.rake.erb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 LITESTREAM_CONFIG = ENV["LITESTREAM_CONFIG"] || Rails.root.join("tmp/litestream.yml").to_s
 
 LITESTREAM_TEMPLATE = <<-EOF
@@ -36,7 +37,7 @@ namespace :litestream do
     end
 
     @dbs.each do |db|
-      next if File.exist?(db) or !ENV["BUCKET_NAME"]
+      next if File.exist?(db) || !ENV["BUCKET_NAME"]
       system "litestream restore -config #{LITESTREAM_CONFIG} -if-replica-exists #{db}"
       exit $?.exitstatus unless $?.exitstatus == 0
     end
@@ -45,8 +46,12 @@ namespace :litestream do
   task :run do
     require "shellwords"
 
-    exec(*%w[bundle exec litestream replicate -config],
-      LITESTREAM_CONFIG, "-exec", Shellwords.join(ARGV[1..-1]))
+    if ENV["BUCKET_NAME"]
+      exec(*%w[bundle exec litestream replicate -config],
+        LITESTREAM_CONFIG, "-exec", Shellwords.join(ARGV[1..]))
+    else
+      exec(*ARGV[1..])
+    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.7.10
 platform: ruby
 authors:
 - Sam Ruby
 bindir: bin
 cert_chain: []
-date: 2025-02-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Dockerfile generator for Rails
 test_files: []