From 9b7dd60ff42746f2a93ce19ca286b8157515318a Mon Sep 17 00:00:00 2001 From: keimoon Date: Mon, 7 May 2018 18:53:54 +0700 Subject: [PATCH] Fix bug with docker registry --- utils/common.go | 2 +- utils/docker.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/common.go b/utils/common.go index 3a45774..271a8f6 100644 --- a/utils/common.go +++ b/utils/common.go @@ -12,7 +12,7 @@ import ( // Version returns doriath version func Version() string { - return "1.4.0" + return "1.4.1" } // ResolveDir appends a path to a rootDir diff --git a/utils/docker.go b/utils/docker.go index 5549504..96efa1b 100644 --- a/utils/docker.go +++ b/utils/docker.go @@ -18,7 +18,7 @@ import ( // Default values const ( DefaultRegistryName = "dockerhub" - DefaultRegistry = "https://registry-1.docker.io" + DefaultRegistry = "https://registry.hub.docker.com" ) var fromRegex = regexp.MustCompile("^[fF][rR][oO][mM]\\s+") @@ -242,6 +242,8 @@ func dockerRequestToken(shortName string, authInfo *dockerAuthInfo, credential * tokenQueryParams.Add("service", authInfo.service) if authInfo.scope == "" { tokenQueryParams.Add("scope", "repository:"+shortName+":*") + } else { + tokenQueryParams.Add("scope", authInfo.scope) } tokenURL := authInfo.realm + "?" + tokenQueryParams.Encode() request, err := http.NewRequest("GET", tokenURL, nil)