self-hosted/watchtower
self-hosted/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2024-12-15 09:14:13 +02:00
Code Issues Releases Activity

go fmt done!

Browse Source
This commit is contained in:
Tanguy ⧓ Herrmann 2016-12-17 22:55:45 +01:00
parent f8a2f80b92
commit 4909b90662
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
container/client.go
View File

@ -2,13 +2,13 @@ package container
import ( import (
"fmt" "fmt"
"time"
"io/ioutil" "io/ioutil"
"time"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
dockerclient "github.com/docker/docker/client"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
dockerclient "github.com/docker/docker/client"
"golang.org/x/net/context" "golang.org/x/net/context"
) )
@ -77,7 +77,7 @@ func (client dockerClient) ListContainers(fn Filter) ([]Container, error) {
} }
c := Container{containerInfo: &containerInfo, imageInfo: &imageInfo} c := Container{containerInfo: &containerInfo, imageInfo: &imageInfo}
if (fn(c)) { if fn(c) {
cs = append(cs, c) cs = append(cs, c)
} }
} }
@ -116,7 +116,7 @@ func (client dockerClient) StopContainer(c Container, timeout time.Duration) err
} }
func (client dockerClient) StartContainer(c Container) error { func (client dockerClient) StartContainer(c Container) error {
bg := context.Background(); bg := context.Background()
config := c.runtimeConfig() config := c.runtimeConfig()
hostConfig := c.hostConfig() hostConfig := c.hostConfig()
networkConfig := &network.NetworkingConfig{EndpointsConfig: c.containerInfo.NetworkSettings.Networks} networkConfig := &network.NetworkingConfig{EndpointsConfig: c.containerInfo.NetworkSettings.Networks}
@ -178,7 +178,7 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
if client.pullImages { if client.pullImages {
log.Debugf("Pulling %s for %s", imageName, c.Name()) log.Debugf("Pulling %s for %s", imageName, c.Name())
var opts types.ImagePullOptions // ImagePullOptions can take a RegistryAuth arg to authenticate against a private registry var opts types.ImagePullOptions // ImagePullOptions can take a RegistryAuth arg to authenticate against a private registry
auth, err := EncodedAuth(imageName) auth, err := EncodedAuth(imageName)
if err != nil { if err != nil {
@ -197,7 +197,7 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
return false, err return false, err
} }
defer response.Close() defer response.Close()
// the pull request will be aborted prematurely unless the response is read // the pull request will be aborted prematurely unless the response is read
_, err = ioutil.ReadAll(response) _, err = ioutil.ReadAll(response)
} }
@ -213,7 +213,6 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
} else { } else {
log.Debugf("No new images found for %s", c.Name()) log.Debugf("No new images found for %s", c.Name())
} }
return false, nil return false, nil
} }

8
container/trust.go
View File

@ -2,8 +2,6 @@ package container
import ( import (
"errors" "errors"
"os"
"strings"
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"
@ -11,6 +9,8 @@ import (
"github.com/docker/docker/cliconfig" "github.com/docker/docker/cliconfig"
"github.com/docker/docker/cliconfig/configfile" "github.com/docker/docker/cliconfig/configfile"
"github.com/docker/docker/cliconfig/credentials" "github.com/docker/docker/cliconfig/credentials"
"os"
"strings"
) )
/** /**
@ -35,7 +35,7 @@ func EncodedEnvAuth(ref string) (string, error) {
username := os.Getenv("REPO_USER") username := os.Getenv("REPO_USER")
password := os.Getenv("REPO_PASS") password := os.Getenv("REPO_PASS")
if username != "" && password != "" { if username != "" && password != "" {
auth := types.AuthConfig { auth := types.AuthConfig{
Username: username, Username: username,
Password: password, Password: password,
} }
@ -80,7 +80,7 @@ func ParseServerAddress(ref string) (string, error) {
} }
parts := strings.Split(repository, "/") parts := strings.Split(repository, "/")
return parts[0], nil return parts[0], nil
} }
// CredentialsStore returns a new credentials store based // CredentialsStore returns a new credentials store based

4
container/util.go
View File

@ -1,8 +1,5 @@
package container package container
import (
)
func sliceEqual(s1, s2 []string) bool { func sliceEqual(s1, s2 []string) bool {
if len(s1) != len(s2) { if len(s1) != len(s2) {
return false return false
@ -65,4 +62,3 @@ func structMapSubtract(m1, m2 map[string]struct{}) map[string]struct{} {
return m return m
} }

1
container/util_test.go
View File

@ -63,4 +63,3 @@ func TestStructMapSubtract(t *testing.T) {
assert.Equal(t, map[string]struct{}{"a": x, "b": x, "c": x}, m1) assert.Equal(t, map[string]struct{}{"a": x, "b": x, "c": x}, m1)
assert.Equal(t, map[string]struct{}{"a": x, "c": x}, m2) assert.Equal(t, map[string]struct{}{"a": x, "c": x}, m2)
} }