Allow mounting the docker socket using WithBindMount #9511
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: davidfowl <[email protected]>
github-actions
bot
added
the
area-app-model
Copilot
AI
changed the title
Copilot finished work on behalf of
davidfowl
May 26, 2025 10:02
davidfowl
reviewed
May 26, 2025
tests/Aspire.Hosting.Containers.Tests/DockerSocketBindMountTests.cs
Outdated
Show resolved
Hide resolved
Co-authored-by: davidfowl <[email protected]>
Co-authored-by: davidfowl <[email protected]>
Co-authored-by: davidfowl <[email protected]>
Co-authored-by: davidfowl <[email protected]>
|
Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details. Warning Firewall rules blocked me from connecting to one or more addressesI tried to connect to the following addresses, but was blocked by firewall rules:
If you need me to access, download, or install something from one of these locations, you can either:
|
Copilot finished work on behalf of
davidfowl
May 26, 2025 10:42
mitchdenny
reviewed
May 26, 2025
Copilot finished work on behalf of
davidfowl
May 27, 2025 00:31
|
Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details. Warning Firewall rules blocked me from connecting to one or more addressesI tried to connect to the following addresses, but was blocked by firewall rules:
If you need me to access, download, or install something from one of these locations, you can either:
|
Copilot finished work on behalf of
davidfowl
May 27, 2025 00:41
eerhardt
reviewed
May 27, 2025
|
|
||
| var annotation = new ContainerMountAnnotation(Path.GetFullPath(source, builder.ApplicationBuilder.AppHostDirectory), target, ContainerMountType.BindMount, isReadOnly); | ||
| // If the source starts with '/', it's a Linux-style rooted path, so we use it directly without resolution | ||
| var sourcePath = source.StartsWith('/') ? source : Path.GetFullPath(source, builder.ApplicationBuilder.AppHostDirectory); |
There was a problem hiding this comment.
Instead of "starts with /", should this check if the path is already rooted?
There was a problem hiding this comment.
Changed to use Path.IsPathRooted() instead of checking StartsWith('/'). This is more robust as it properly handles absolute paths on different operating systems. The change was implemented in 3ed3296.
Co-authored-by: eerhardt <[email protected]>
|
Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details. Warning Firewall rules blocked me from connecting to one or more addressesI tried to connect to the following addresses, but was blocked by firewall rules:
If you need me to access, download, or install something from one of these locations, you can either:
|
Copilot finished work on behalf of
eerhardt
May 27, 2025 16:03
Copilot finished work on behalf of
danegsta
May 27, 2025 16:14
eerhardt
approved these changes
May 27, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
This PR addresses the need to mount
/var/run/docker.sockinto containers, enabling Docker-in-Docker scenarios. Two main changes were made:Modified the
WithBindMountmethod to special-case Linux-style absolute paths (those starting with/):/are now passed through directly without attempting to resolve them relative to the AppHost directoryAdded a new convenience extension method
WithDockerSocketBindMount()that:/var/run/docker.sockto/var/run/docker.sockin the containerTests Added
ContainerMountAnnotationthat verifies it accepts/var/run/docker.sockas a valid bind mount sourceWithBindMountthat verifies it correctly handles Docker socket pathsWithDockerSocketBindMountmethod to verify it creates the correct annotationDockerSocketBindMountTests.csto verify the Docker socket binding works correctlyBefore this change, users could not easily mount the Docker socket into containers when specifying Linux paths on Windows hosts, as the code would incorrectly try to resolve
/var/run/docker.sockas a relative path.Fixes #7077.
Warning
Firewall rules blocked me from connecting to one or more addresses
I tried to connect to the following addresses, but was blocked by firewall rules:
0t3vsblobprodcus362.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)7devsblobprodcus323.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)7k6vsblobprodcus337.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)cdn.fwupd.orgdlbvsblobprodcus316.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)h6tvsblobprodcus346.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)i1qvsblobprodcus353.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)imzvsblobprodcus368.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)jd4vsblobprodcus366.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)kh4vsblobprodcus325.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)l49vsblobprodcus358.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)ofvvsblobprodcus315.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)p2ovsblobprodcus312.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)pe4vsblobprodcus351.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)x3yvsblobprodcus370.vsblob.vsassets.io/home/REDACTED/work/aspire/aspire/.dotnet/dotnet test tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj(dns block)If you need me to access, download, or install something from one of these locations, you can either:
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.