tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #553 from docker/debug_acr_login_error 

In case of error while auto-login to ACR registry, print error info in addition to warning.
This commit is contained in:
Guillaume Tardif 2020-08-27 11:27:59 +02:00 committed by GitHub
parent 7c891ff3ee 8dbb6c58b9
commit 7f278fa2c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
aci/convert/registry_credentials.go
View File

@ -70,6 +70,7 @@ func getRegistryCredentials(project compose.Project, helper registryHelper) ([]c
for _, registry := range acrRegistries {
err := helper.autoLoginAcr(registry)
if err != nil {
fmt.Printf("WARNING : %v\n", err)
fmt.Printf("Could not automatically login to %s from your Azure login. Assuming you already logged in to the ACR registry\n", registry)
}
}
@ -158,20 +159,24 @@ func (c cliRegistryHelper) autoLoginAcr(registry string) error {
repoAuthURL := fmt.Sprintf("https://%s/oauth2/exchange", registry)
res, err := http.Post(repoAuthURL, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
if err != nil {
return err
}
if res.StatusCode != 200 {
return errors.Errorf("error while accessing ACR token from Azure login, status : %s", res.Status)
return errors.Wrap(err, "could not query ACR token")
}
bits, err := ioutil.ReadAll(res.Body)
if err != nil {
return err
return errors.Wrap(err, "could not read response body")
}
if res.StatusCode != 200 {
return errors.Errorf("could not obtain ACR token from Azure login, status : %s, response: %s", res.Status, string(bits))
}
newToken := oauth2.Token{}
if err := json.Unmarshal(bits, &newToken); err != nil {
return err
return errors.Wrap(err, "could not read ACR token")
}
cmd := exec.Command("docker", "login", "-p", newToken.RefreshToken, "-u", tokenUsername, registry)
return cmd.Run()
cmd := exec.Command("docker", "login", "-u", tokenUsername, "-p", newToken.RefreshToken, registry)
bytes, err := cmd.CombinedOutput()
if err != nil {
return errors.Wrap(err, fmt.Sprintf("could not 'docker login' to %s :\n%s\n", registry, string(bytes)))
}
return nil
}