self-hosted/watchtower
self-hosted/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2025-03-03 15:32:37 +02:00
Code Issues Releases Activity

go fmt...

Browse Source
This commit is contained in:
Fabrizio Steiner 2017-01-24 21:05:27 +01:00
parent 6a72ba24c9
commit eda5391d0a
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/update.go
View File

@ -4,8 +4,8 @@ import (
"math/rand"
"time"
"github.com/v2tec/watchtower/container"
log "github.com/Sirupsen/logrus"
"github.com/v2tec/watchtower/container"
)
var (

13
container/client.go
View File

@ -2,12 +2,12 @@ package container
import (
"fmt"
"time"
"io/ioutil"
"time"
log "github.com/Sirupsen/logrus"
dockerclient "github.com/docker/docker/client"
"github.com/docker/docker/api/types"
dockerclient "github.com/docker/docker/client"
"golang.org/x/net/context"
)
@ -76,7 +76,7 @@ func (client dockerClient) ListContainers(fn Filter) ([]Container, error) {
}
c := Container{containerInfo: &containerInfo, imageInfo: &imageInfo}
if (fn(c)) {
if fn(c) {
cs = append(cs, c)
}
}
@ -115,7 +115,7 @@ func (client dockerClient) StopContainer(c Container, timeout time.Duration) err
}
func (client dockerClient) StartContainer(c Container) error {
bg := context.Background();
bg := context.Background()
config := c.runtimeConfig()
hostConfig := c.hostConfig()
name := c.Name()
@ -144,7 +144,7 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
if client.pullImages {
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
auth, err := EncodedAuth(imageName)
if err != nil {
@ -163,7 +163,7 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
return false, err
}
defer response.Close()
// the pull request will be aborted prematurely unless the response is read
_, err = ioutil.ReadAll(response)
}
@ -179,7 +179,6 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
} else {
log.Debugf("No new images found for %s", c.Name())
}
return false, nil
}

2
container/mockclient/mock.go
View File

@ -3,8 +3,8 @@ package mockclient
import (
"time"
"github.com/v2tec/watchtower/container"
"github.com/stretchr/testify/mock"
"github.com/v2tec/watchtower/container"
)
type MockClient struct {

4
container/util.go
View File

@ -1,8 +1,5 @@
package container
import (
)
func sliceEqual(s1, s2 []string) bool {
if len(s1) != len(s2) {
return false
@ -65,4 +62,3 @@ func structMapSubtract(m1, m2 map[string]struct{}) map[string]struct{} {
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, "c": x}, m2)
}