Use Thruster by default to Rails 8

railties/lib/rails/generators/app_base.rb

@@ -100,6 +100,9 @@ def self.add_shared_options_for(name)
         class_option :skip_dev_gems,       type: :boolean, default: nil,
                                            desc: "Skip development gems (e.g., web-console)"
 
+        class_option :skip_thruster,       type: :boolean, default: nil,
+                                           desc: "Skip Thruster setup"
+
         class_option :skip_rubocop,        type: :boolean, default: nil,
                                            desc: "Skip RuboCop setup"
 
@@ -394,6 +397,10 @@ def skip_propshaft?
         skip_asset_pipeline? || options[:asset_pipeline] != "propshaft"
       end
 
+      def skip_thruster?
+        options[:skip_thruster]
+      end
+
       def skip_rubocop?
         options[:skip_rubocop]
       end

railties/lib/rails/generators/rails/app/app_generator.rb

@@ -108,7 +108,7 @@ def app
     end
 
     def bin
-      exclude_pattern = Regexp.union([(/rubocop/ if skip_rubocop?), (/brakeman/ if skip_brakeman?)].compact)
+      exclude_pattern = Regexp.union([(/thrust/ if skip_thruster?), (/rubocop/ if skip_rubocop?), (/brakeman/ if skip_brakeman?)].compact)
       directory "bin", { exclude_pattern: exclude_pattern } do |content|
         "#{shebang}\n" + content
       end

railties/lib/rails/generators/rails/app/templates/Dockerfile.tt

@@ -1,8 +1,10 @@
 # syntax = docker/dockerfile:1
 
 # This Dockerfile is designed for production, not development. Use with Kamal or build'n'run by hand:
-# docker build -t my-app .
-# docker run -d -p 80:80 -p 443:443 --name my-app -e RAILS_MASTER_KEY=<value from config/master.key> my-app
+# docker build -t <%= app_name %> .
+# docker run -d -p 80:<%= skip_thruster? ? 3000 : 80 %> -e RAILS_MASTER_KEY=<value from config/master.key> --name <%= app_name %> <%= app_name %>
+
+# For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html
 
 # For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html
 
@@ -107,6 +109,12 @@ USER 1000:1000
 # Entrypoint prepares the database.
 ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 
+<% if skip_thruster? -%>
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 3000
 CMD ["./bin/rails", "server"]
+<% else -%>
+# Start server via Thruster by default, this can be overwritten at runtime
+EXPOSE 80
+CMD ["./bin/thrust", "./bin/rails", "server"]
+<% end -%>

railties/lib/rails/generators/rails/app/templates/Gemfile.tt

@@ -24,6 +24,11 @@ gem "bootsnap", require: false
 # Deploy this application anywhere as a Docker container [https://kamal-deploy.org]
 gem "kamal", require: false
 <% end -%>
+<% unless options.skip_thruster? -%>
+
+# Add HTTP/2, HTTP asset caching/compression, Let's Encrypt auto-certificates to Puma [https://github.com/basecamp/thruster/]
+gem "thruster", require: false
+<% end -%>
 <% unless skip_active_storage? -%>
 
 # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]

railties/lib/rails/generators/rails/app/templates/bin/thrust.tt

@@ -0,0 +1,4 @@
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("thruster", "thrust")

railties/lib/rails/generators/rails/app/templates/docker-entrypoint.tt

@@ -7,7 +7,7 @@ fi
 
 <% unless skip_active_record? -%>
 # If running the rails server then create or migrate existing database
-if [ "${1}" == "./bin/rails" ] && [ "${2}" == "server" ]; then
+if [ "${@: -2:1}" == "./bin/rails" ] && [ "${@: -1:1}" == "server" ]; then
   ./bin/rails db:prepare
 fi
 

railties/lib/rails/generators/rails/plugin/plugin_generator.rb

@@ -112,6 +112,7 @@ def test
     def generate_test_dummy(force = false)
       opts = options.transform_keys(&:to_sym).except(*DUMMY_IGNORE_OPTIONS)
       opts[:force] = force
+      opts[:skip_thruster] = true
       opts[:skip_brakeman] = true
       opts[:skip_bundle] = true
       opts[:skip_ci] = true

railties/test/generators/app_generator_test.rb

@@ -43,6 +43,7 @@
   bin/rake
   bin/rubocop
   bin/setup
+  bin/thrust
   config.ru
   config/application.rb
   config/boot.rb
@@ -605,6 +606,18 @@ def test_inclusion_of_a_debugger
     end
   end
 
+  def test_inclusion_of_thruster
+    run_generator
+    assert_gem "thruster"
+  end
+
+  def test_thruster_is_skipped_if_required
+    run_generator [destination_root, "--skip-thruster"]
+
+    assert_no_gem "thruster"
+    assert_no_file "bin/thrust"
+  end
+
   def test_inclusion_of_rubocop
     run_generator
     assert_gem "rubocop-rails-omakase"