Merge pull request #153 from fly-apps/make-parallelize

Use MAKE="make -j$(nproc)" to speed up bundle install step

Author: rubys

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:
 

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"
 

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 -%>