diff --git a/.github/workflows/devcontainer-smoke-test.yml b/.github/workflows/devcontainer-smoke-test.yml index 8fbc31780d..7b2354eb29 100644 --- a/.github/workflows/devcontainer-smoke-test.yml +++ b/.github/workflows/devcontainer-smoke-test.yml @@ -33,6 +33,10 @@ jobs: - name: Generate rails app sqlite3 run: bundle exec railties/exe/rails new myapp_sqlite --database="sqlite3" --dev + - name: Remove old deprecated docker-compose + run: | + sudo rm /usr/local/bin/docker-compose + - name: Test devcontainer sqlite3 uses: devcontainers/ci@v0.3 with: diff --git a/railties/lib/rails/generators/rails/app/templates/.devcontainer/compose.yaml.tt b/railties/lib/rails/generators/rails/app/templates/.devcontainer/compose.yaml.tt index 4541cf180f..f365e30d00 100644 --- a/railties/lib/rails/generators/rails/app/templates/.devcontainer/compose.yaml.tt +++ b/railties/lib/rails/generators/rails/app/templates/.devcontainer/compose.yaml.tt @@ -1,3 +1,5 @@ +name: "<%= app_name %>" + services: rails-app: build: diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 83a6109612..59db6951cb 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -1295,6 +1295,8 @@ def test_devcontainer assert_match(/ARG RUBY_VERSION=#{RUBY_VERSION}/, content) end assert_compose_file do |compose_config| + assert_equal "my_app", compose_config["name"] + expected_rails_app_config = { "build" => { "context" => "..",