mirror of
https://github.com/containrrr/watchtower.git
synced 2025-03-03 15:32:37 +02:00
Add auth config, registry auth fails silently without
This commit is contained in:
parent
44dbd88295
commit
ef430b791a
@ -45,7 +45,7 @@ func Update(client container.Client, names []string, cleanup bool) error {
|
||||
for i, container := range containers {
|
||||
stale, err := client.IsContainerStale(container)
|
||||
if err != nil {
|
||||
log.Infof("Unable to update container %. Proceeding to next.", containers[i].Name())
|
||||
log.Infof("Unable to update container %s. Proceeding to next.", containers[i].Name())
|
||||
log.Debug(err)
|
||||
stale = false
|
||||
}
|
||||
|
@ -7,6 +7,7 @@ import (
|
||||
log "github.com/Sirupsen/logrus"
|
||||
dockerclient "github.com/docker/docker/client"
|
||||
"github.com/docker/docker/api/types"
|
||||
"github.com/docker/docker/cli/command"
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
@ -144,16 +145,23 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
|
||||
|
||||
if client.pullImages {
|
||||
log.Debugf("Pulling %s for %s", imageName, c.Name())
|
||||
|
||||
auth := types.AuthConfig {
|
||||
Username: "testuser",
|
||||
Password: "testpassword",
|
||||
}
|
||||
encodedAuth, err := command.EncodeAuthToBase64(auth)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
// Note: ImagePullOptions below can take a RegistryAuth arg if 401 on private registry
|
||||
closer, err := client.api.ImagePull(bg, imageName, types.ImagePullOptions{})
|
||||
if (err != nil) {
|
||||
closer, err := client.api.ImagePull(bg, imageName, types.ImagePullOptions{RegistryAuth: encodedAuth})
|
||||
if err != nil {
|
||||
log.Debugf("Error pulling image %s, %s", imageName, err)
|
||||
return false, err
|
||||
} else {
|
||||
closer.Close()
|
||||
}
|
||||
|
||||
defer closer.Close()
|
||||
}
|
||||
|
||||
newImageInfo, _, err := client.api.ImageInspectWithRaw(bg, imageName)
|
||||
@ -166,6 +174,7 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
|
||||
return true, nil
|
||||
} else {
|
||||
log.Debugf("No new images found for %s", c.Name())
|
||||
log.Debugf("Old image ID %s is the same as New Image ID %s", oldImageInfo.ID, newImageInfo.ID)
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user