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

Add optional support for registry authentication on the command line

Browse source
This commit is contained in:
Casper Wilstrup 2015-09-01 14:39:28 +02:00
parent 39c014c0cf
commit 3334f9d1c7
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
container/client.go
View file

@ -30,19 +30,21 @@ type Client interface {
// NewClient returns a new Client instance which can be used to interact with // NewClient returns a new Client instance which can be used to interact with
// the Docker API. // the Docker API.
func NewClient(dockerHost string, tlsConfig *tls.Config, pullImages bool) Client { func NewClient(dockerHost string, tlsConfig *tls.Config, username string, password string, pullImages bool) Client {
docker, err := dockerclient.NewDockerClient(dockerHost, tlsConfig) docker, err := dockerclient.NewDockerClient(dockerHost, tlsConfig)
if err != nil { if err != nil {
log.Fatalf("Error instantiating Docker client: %s", err) log.Fatalf("Error instantiating Docker client: %s", err)
} }
return dockerClient{api: docker, pullImages: pullImages} return dockerClient{api: docker, pullImages: pullImages, username: username, password: password}
} }
type dockerClient struct { type dockerClient struct {
api dockerclient.Client api dockerclient.Client
pullImages bool pullImages bool
username string
password string
} }
func (client dockerClient) ListContainers(fn Filter) ([]Container, error) { func (client dockerClient) ListContainers(fn Filter) ([]Container, error) {
@ -131,8 +133,12 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
imageName := c.ImageName() imageName := c.ImageName()
if client.pullImages { if client.pullImages {
var a *dockerclient.AuthConfig = nil
if client.username!="" {
a = &dockerclient.AuthConfig{Username: client.username, Password: client.password, Email: ""}
}
log.Debugf("Pulling %s for %s", imageName, c.Name()) log.Debugf("Pulling %s for %s", imageName, c.Name())
if err := client.api.PullImage(imageName, nil); err != nil { if err := client.api.PullImage(imageName, a); err != nil {
return false, err return false, err
} }
} }

10
main.go
View file

@ -89,6 +89,14 @@ func main() {
Name: "debug", Name: "debug",
Usage: "enable debug mode with verbose logging", Usage: "enable debug mode with verbose logging",
}, },
cli.StringFlag{
Name: "username, u",
Usage: "username for registry authentication",
},
cli.StringFlag{
Name: "password, p",
Usage: "username for registry authentication",
},
} }
if err := app.Run(os.Args); err != nil { if err := app.Run(os.Args); err != nil {
@ -110,7 +118,7 @@ func before(c *cli.Context) error {
return err return err
} }
client = container.NewClient(c.GlobalString("host"), tls, !c.GlobalBool("no-pull")) client = container.NewClient(c.GlobalString("host"), tls, c.GlobalString("username"), c.GlobalString("password"), !c.GlobalBool("no-pull"))
handleSignals() handleSignals()
return nil return nil