Skip to content

fix: use path.Join instead of url.JoinPath when prepending a custom registry to an image #3308

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
mdelapenya merged 2 commits into from
Sep 30, 2025
Merged

fix: use path.Join instead of url.JoinPath when prepending a custom registry to an image #3308

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
d4fc16c
fix(images): use path.Join instead of url.JoinPath when prepending a …
fedorkanin Sep 26, 2025
193b35f
Update image_substitutors_test.go
fedorkanin Sep 29, 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
8 changes: 8 additions & 0 deletions image_substitutors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ func TestPrependHubRegistrySubstitutor(t *testing.T) {

require.Equalf(t, "my-registry/org/user/foo:latest", img, "expected my-registry/org/foo:latest, got %s", img)
})

t.Run("registry-with-port", func(t *testing.T) {
s := newPrependHubRegistry("my-registry:5000")

img, err := s.Substitute("foo:latest")
require.NoError(t, err)
require.Equalf(t, "my-registry:5000/foo:latest", img, "expected my-registry:5000/foo:latest, got %s", img)
})
})

t.Run("should not prepend the hub registry to the image name", func(t *testing.T) {
Expand Down
16 changes: 3 additions & 13 deletions options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"fmt"
"maps"
"net/url"
"path"
"time"

"dario.cat/mergo"
Expand Down Expand Up @@ -196,12 +196,7 @@ func (c CustomHubSubstitutor) Substitute(image string) (string, error) {
}
}

result, err := url.JoinPath(c.hub, image)
if err != nil {
return "", err
}

return result, nil
return path.Join(c.hub, image), nil
}

// prependHubRegistry represents a way to prepend a custom Hub registry to the image name,
Expand Down Expand Up @@ -244,12 +239,7 @@ func (p prependHubRegistry) Substitute(image string) (string, error) {
}
}

result, err := url.JoinPath(p.prefix, image)
if err != nil {
return "", err
}

return result, nil
return path.Join(p.prefix, image), nil
}

// WithImageSubstitutors sets the image substitutors for a container
Expand Down
Loading