Skip to content

fix: preserve unix socket schema in testcontainersHostFromProperties #3213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 5, 2025
+22 −7
Merged

fix: preserve unix socket schema in testcontainersHostFromProperties #3213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc36d39
fix: preserve unix socket schema in testcontainers host from properties
knqyf263 Jun 18, 2025
28dabb9
Merge branch 'main' into fix-unix-socket-parsing
mdelapenya Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions internal/core/docker_host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,12 +298,14 @@ func testcontainersHostFromProperties(_ context.Context) (string, error) {
cfg := config.Read()
testcontainersHost := cfg.TestcontainersHost
if testcontainersHost != "" {
parsed, err := parseURL(testcontainersHost)
// Validate the URL format
_, err := parseURL(testcontainersHost)
if err != nil {
return "", err
}

return parsed, nil
// Return the original URL to preserve schema for Docker client
return testcontainersHost, nil
}

return "", ErrTestcontainersHostNotSetInProperties
Expand Down
23 changes: 18 additions & 5 deletions internal/core/docker_host_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,26 @@ func TestExtractDockerHost(t *testing.T) {
t.Cleanup(resetSocketOverrideFn)

t.Run("Testcontainers host is defined in properties", func(t *testing.T) {
content := "tc.host=" + testRemoteHost
t.Run("TCP host", func(t *testing.T) {
content := "tc.host=" + testRemoteHost

setupTestcontainersProperties(t, content)
setupTestcontainersProperties(t, content)

socket, err := testcontainersHostFromProperties(context.Background())
require.NoError(t, err)
require.Equal(t, testRemoteHost, socket)
socket, err := testcontainersHostFromProperties(context.Background())
require.NoError(t, err)
require.Equal(t, testRemoteHost, socket)
})

t.Run("Unix socket host preserves schema", func(t *testing.T) {
unixSocket := "unix:///var/run/docker.sock"
content := "tc.host=" + unixSocket

setupTestcontainersProperties(t, content)

socket, err := testcontainersHostFromProperties(context.Background())
require.NoError(t, err)
require.Equal(t, unixSocket, socket)
})
})

t.Run("Testcontainers host is not defined in properties", func(t *testing.T) {
Expand Down
Loading