Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2026-01-01 14:48:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

unite trust.ParseServerAddress & helpers.NormalizeRegistry

Browse source
This commit is contained in:
Reinier van der Leer 2023-01-22 16:56:44 +01:00
parent f0e075c390
commit 85f5c1fdb1
No known key found for this signature in database
GPG key ID: DBC4942A5C29D7FA
8 changed files with 46 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/registry/registry.go
View file

@ -41,17 +41,17 @@ func DefaultAuthHandler() (string, error) {
// Will return false if behavior for container is unknown.
func WarnOnAPIConsumption(container watchtowerTypes.Container) bool {
normalizedName, err := ref.ParseNormalizedNamed(container.ImageName())
normalizedRef, err := ref.ParseNormalizedNamed(container.ImageName())
if err != nil {
return true
}
containerHost, err := helpers.NormalizeRegistry(normalizedName.String())
containerHost, err := helpers.GetRegistryAddress(normalizedRef.Name())
if err != nil {
return true
}
if containerHost == "index.docker.io" || containerHost == "ghcr.io" {
if containerHost == helpers.DefaultRegistryHost || containerHost == "ghcr.io" {
return true
}