Merge pull request rails#46775 from jonathanhefner/plugin-dummy-skip-docker-files

Skip Docker-related files for plugin dummy apps

Author: jonathanhefner

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

@@ -351,9 +351,8 @@ def update_active_storage
       remove_task :update_active_storage
 
       def create_dockerfiles
-        unless options[:skip_docker]
-          build(:dockerfiles)
-        end
+        return if options[:skip_docker] || options[:dummy_app]
+        build(:dockerfiles)
       end
 
       def create_config_files

railties/test/generators/app_generator_test.rb

@@ -1017,6 +1017,14 @@ def test_dockerignore
     end
   end
 
+  def test_skip_docker
+    run_generator [destination_root, "--skip-docker"]
+
+    assert_no_file ".dockerignore"
+    assert_no_file "Dockerfile"
+    assert_no_file "bin/docker-entrypoint"
+  end
+
   def test_system_tests_directory_generated
     run_generator
 

railties/test/generators/plugin_generator_test.rb

@@ -613,6 +613,8 @@ def test_unnecessary_files_are_not_generated_in_dummy_application
     assert_no_file "test/dummy/README.md"
     assert_no_file "test/dummy/config/master.key"
     assert_no_file "test/dummy/config/credentials.yml.enc"
+    assert_no_file "test/dummy/Dockerfile"
+    assert_no_file "test/dummy/.dockerignore"
     assert_no_directory "test/dummy/lib/tasks"
     assert_no_directory "test/dummy/test"
     assert_no_directory "test/dummy/vendor"

railties/test/generators/shared_generator_tests.rb

@@ -132,13 +132,6 @@ def test_skip_keeps
     assert_no_file("app/models/concerns/.keep")
   end
 
-  def test_skip_docker
-    run_generator [destination_root, "--skip-docker", "--full"]
-    assert_no_file(".dockerignore")
-    assert_no_file("Dockerfile")
-    assert_no_file("bin/docker-entrypoint")
-  end
-
   def test_default_frameworks_are_required_when_others_are_removed
     run_generator [
       destination_root,