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

Implement support for updating stopped containers

Browse source 
This commit adds a command line flag, "--check-all". If true, the
behavior requested by #112 is used (i.e., stopped containers are updated
but not restarted). If false, the previous behavior is used (ignore
stopped containers entirely).
This commit is contained in:
Alex Hicks 2018-01-10 09:32:01 -05:00
parent 2cfbebb0e9
commit ab14e25f7c
No known key found for this signature in database
GPG key ID: 8C00D3C81928CA24
4 changed files with 42 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

36
container/client.go
View file

@ -37,31 +37,41 @@ type Client interface {
// * DOCKER_HOST the docker-engine host to send api requests to
// * DOCKER_TLS_VERIFY whether to verify tls certificates
// * DOCKER_API_VERSION the minimum docker api version to work with
func NewClient(pullImages, enableLabel bool) Client {
func NewClient(pullImages, enableLabel bool, checkAll bool) Client {
cli, err := dockerclient.NewEnvClient()
if err != nil {
log.Fatalf("Error instantiating Docker client: %s", err)
}
return dockerClient{api: cli, pullImages: pullImages, enableLabel: enableLabel}
return dockerClient{
api: cli,
pullImages: pullImages,
enableLabel: enableLabel,
checkAll: checkAll}
}
type dockerClient struct {
api *dockerclient.Client
pullImages bool
enableLabel bool
checkAll bool
}
func (client dockerClient) ListContainers(fn Filter) ([]Container, error) {
cs := []Container{}
bg := context.Background()
log.Debug("Retrieving running containers")
if client.checkAll {
log.Debug("Retrieving containers")
} else {
log.Debug("Retrieving running containers")
}
runningContainers, err := client.api.ContainerList(
bg,
types.ContainerListOptions{})
types.ContainerListOptions{
All: client.checkAll})
if err != nil {
return nil, err
}
@ -103,10 +113,12 @@ func (client dockerClient) StopContainer(c Container, timeout time.Duration) err
signal = defaultStopSignal
}
log.Infof("Stopping %s (%s) with %s", c.Name(), c.ID(), signal)
if c.WasRunning {
log.Infof("Stopping %s (%s) with %s", c.Name(), c.ID(), signal)
if err := client.api.ContainerKill(bg, c.ID(), signal); err != nil {
return err
if err := client.api.ContainerKill(bg, c.ID(), signal); err != nil {
return err
}
}
// Wait for container to exit, but proceed anyway after the timeout elapses
@ -173,11 +185,13 @@ func (client dockerClient) StartContainer(c Container) error {
}
log.Debugf("Starting container %s (%s)", name, creation.ID)
if c.WasRunning {
log.Debugf("Starting container %s (%s)", name, creation.ID)
err = client.api.ContainerStart(bg, creation.ID, types.ContainerStartOptions{})
if err != nil {
return err
err = client.api.ContainerStart(bg, creation.ID, types.ContainerStartOptions{})
if err != nil {
return err
}
}
return nil

10
container/container.go
View file

@ -27,7 +27,8 @@ func NewContainer(containerInfo *types.ContainerJSON, imageInfo *types.ImageInsp
// Container represents a running Docker container.
type Container struct {
Stale bool
Stale bool
WasRunning bool
containerInfo *types.ContainerJSON
imageInfo *types.ImageInspect
@ -106,6 +107,13 @@ func (c Container) IsWatchtower() bool {
return ok && val == "true"
}
// IsRunning returns a boolean flag indicating whether or not the current
// container is running. The status is determined by the value of the
// container's "State.Running" property.
func (c Container) IsRunning() bool {
return c.containerInfo.State.Running
}
// StopSignal returns the custom stop signal (if any) that is encoded in the
// container's metadata. If the container has not specified a custom stop
// signal, the empty string "" is returned.