Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2026-02-17 12:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use simple string instead of JSON string for pre/post update commands.

Browse source
This commit is contained in:
Alexandre Menif 2018-06-18 19:37:32 +02:00
parent 25c7853f03
commit 78a375f86e
5 changed files with 26 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

13
container/client.go
View file

@ -25,7 +25,7 @@ type Client interface {
RenameContainer(Container, string) error
IsContainerStale(Container) (bool, error)
RemoveImage(Container) error
ExecuteCommand(Container, CommandInfo) error
ExecuteCommand(Container, string) error
}
// NewClient returns a new Client instance which can be used to interact with
@ -223,7 +223,7 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
return false, nil
}
func (client dockerClient) ExecuteCommand(c Container, commandInfo CommandInfo) error {
func (client dockerClient) ExecuteCommand(c Container, command string) error {
bg := context.Background()
// Get the id of the actual container
@ -235,14 +235,11 @@ func (client dockerClient) ExecuteCommand(c Container, commandInfo CommandInfo)
// Create the exec
execConfig := types.ExecConfig{
User: commandInfo.User,
Privileged: commandInfo.Privileged,
Tty: true,
AttachStderr: true,
AttachStdout: true,
Detach: false,
Env: commandInfo.Env,
Cmd: commandInfo.Cmd,
Cmd: []string{"sh", "-c", command},
}
exec, err := client.api.ContainerExecCreate(bg, containerID, execConfig)
if err != nil {
@ -257,13 +254,13 @@ func (client dockerClient) ExecuteCommand(c Container, commandInfo CommandInfo)
}
// Inspect the exec to get the exit code and print a message if the
// exit code is not success
// exit code is not success.
execInspect, err := client.api.ContainerExecInspect(bg, exec.ID)
if err != nil {
return err
}
if execInspect.ExitCode > 0 {
log.Error("Failed to execute command.")
log.Errorf("Command exited with code %v.", execInspect.ExitCode)
}
return nil

33
container/command_info.go
View file

@ -1,33 +0,0 @@
package container
import (
"encoding/json"
)
// CommandInfo is the data structure used to encode information about a
// pre/post-update command.
type CommandInfo struct {
User string
Privileged bool
Env []string
Cmd []string
}
// ReadCommandInfoFromJSON takes a JSON formatted description of a
// pre/post-update as input and returns the parsed data as a CommandInfo.
func ReadCommandInfoFromJSON(commandInfoJSON string) (CommandInfo, error) {
commandInfo := CommandInfo{}
err := json.Unmarshal([]byte(commandInfoJSON), &commandInfo)
if err != nil {
return CommandInfo{}, err
}
return commandInfo, nil
}
// IsDefined returns true if a CommandInfo actually contains a command to
// execute or false otherwise.
func (commandInfo CommandInfo) IsDefined() bool {
return commandInfo.Cmd != nil && len(commandInfo.Cmd) > 0
}

24
container/container.go
View file

@ -119,34 +119,26 @@ func (c Container) StopSignal() string {
return ""
}
// PreUpdateCommandInfo returns the pre-update command set in the container's
// PreUpdateCommand returns the pre-update command set in the container's
// metadata or an empty string if the user did not set it.
func (c Container) PreUpdateCommandInfo() (CommandInfo, error) {
func (c Container) PreUpdateCommand() string {
if val, ok := c.containerInfo.Config.Labels[preUpdateCommandLabel]; ok {
commandInfo, err := ReadCommandInfoFromJSON(val)
if err != nil {
return CommandInfo{}, err
}
return commandInfo, nil
return val
}
return CommandInfo{}, nil
return ""
}
// PostUpdateCommandInfo returns the post-update command set in the container's
// PostUpdateCommand returns the post-update command set in the container's
// metadata or an empty string if the user did not set it.
func (c Container) PostUpdateCommandInfo() (CommandInfo, error) {
func (c Container) PostUpdateCommand() string {
if val, ok := c.containerInfo.Config.Labels[postUpdateCommandLabel]; ok {
commandInfo, err := ReadCommandInfoFromJSON(val)
if err != nil {
return CommandInfo{}, err
}
return commandInfo, nil
return val
}
return CommandInfo{}, nil
return ""
}
// Ideally, we'd just be able to take the ContainerConfig from the old container