Fix bug with docker registry

anduintransaction · May 7, 2018 · 9b7dd60 · 9b7dd60
1 parent 009406c
commit 9b7dd60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)