Skip to content

Commit 7d2e133

Browse files
authored
Merge pull request rails#54631 from elalemanyo/feature/improve-devcontainer-mount
Improve devcontainer volume mount to only include the app folder
2 parents 8941c06 + 93f3793 commit 7d2e133

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

railties/lib/rails/generators/rails/devcontainer/templates/devcontainer/compose.yaml.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
dockerfile: .devcontainer/Dockerfile
88

99
volumes:
10-
- ../..:/workspaces:cached
10+
- ../../<%= options[:app_name] %>:/workspaces/<%= options[:app_name] %>:cached
1111

1212
# Overrides default command so things don't shut down after the process ends.
1313
command: sleep infinity

railties/test/generators/app_generator_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ def test_devcontainer
14001400
"context" => "..",
14011401
"dockerfile" => ".devcontainer/Dockerfile"
14021402
},
1403-
"volumes" => ["../..:/workspaces:cached"],
1403+
"volumes" => ["../../#{compose_config["name"]}:/workspaces/#{compose_config["name"]}:cached"],
14041404
"command" => "sleep infinity",
14051405
"depends_on" => ["selenium"]
14061406
}

railties/test/generators/devcontainer_generator_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def test_common_config
360360
"context" => "..",
361361
"dockerfile" => ".devcontainer/Dockerfile"
362362
},
363-
"volumes" => ["../..:/workspaces:cached"],
363+
"volumes" => ["../../#{compose["name"]}:/workspaces/#{compose["name"]}:cached"],
364364
"command" => "sleep infinity"
365365
}
366366
actual_independent_config = compose["services"]["rails-app"].except("depends_on")

0 commit comments

Comments
 (0)