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

When authentication credentials are supplied as env vars they are always used.

Browse source 
This causes authentication failures on registries that don't match, including public registries.
Fallback to no-authentication to handle the case of public registries.
This commit is contained in:
Ross Cadogan 2016-10-18 15:08:25 +01:00
parent 541264281c
commit e75236414e
1 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
container/trust.go
View file

@ -4,7 +4,6 @@ import (
"errors" "errors"
"os" "os"
"strings" "strings"
"fmt"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/reference" "github.com/docker/docker/api/types/reference"
@ -13,19 +12,6 @@ import (
"github.com/docker/docker/cliconfig/credentials" "github.com/docker/docker/cliconfig/credentials"
) )
/*
* Return an encoded auth config for the given registry
* hardcoded for a test environment
*/
func EncodedTestAuth(ref string) (string, error) {
auth := types.AuthConfig {
Username: "testuser",
Password: "testpassword",
}
return EncodeAuth(auth)
}
/* /*
* Return an encoded auth config for the given registry * Return an encoded auth config for the given registry
* loaded from environment variables * loaded from environment variables
@ -38,7 +24,7 @@ func EncodedEnvAuth(ref string) (string, error) {
Username: username, Username: username,
Password: password, Password: password,
} }
log.Debugf("Loaded auth credentials %s from environment for %s", auth, ref) log.Debugf("Loaded auth credentials %s for %s", auth, ref)
return EncodeAuth(auth) return EncodeAuth(auth)
} else { } else {
return "", errors.New("Registry auth environment variables (REPO_USER, REPO_PASS) not set") return "", errors.New("Registry auth environment variables (REPO_USER, REPO_PASS) not set")
@ -88,7 +74,12 @@ func EncodeAuth(auth types.AuthConfig) (string, error) {
return command.EncodeAuthToBase64(auth) return command.EncodeAuthToBase64(auth)
} }
/**
* This function will be invoked if an AuthConfig is rejected
* It could be used to return a new value for the "X-Registry-Auth" authentication header,
* but there's no point trying again with the same value as used in AuthConfig
*/
func DefaultAuthHandler() (string, error) { func DefaultAuthHandler() (string, error) {
log.Error("Authentication requested") log.Debug("Authentication request was rejected. Trying again without authentication")
return "", fmt.Errorf("Error requesting privilege") return "", nil
} }