toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow providing a custom storage directory for docker checkpoints

Browse Source 
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: bd7d51292c399edba5f339e6be55fac6c0811ff5
Component: engine
This commit is contained in:
boucher
2016-09-19 12:01:16 -04:00
parent 0b8e22519c
commit 0e3402d520
24 changed files with 167 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/cluster/executor/backend.go
View File

@ -24,7 +24,7 @@ type Backend interface {
SetupIngress(req clustertypes.NetworkCreateRequest, nodeIP string) error
PullImage(ctx context.Context, image, tag string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error
CreateManagedContainer(config types.ContainerCreateConfig, validateHostname bool) (types.ContainerCreateResponse, error)
ContainerStart(name string, hostConfig *container.HostConfig, validateHostname bool, checkpoint string) error
ContainerStart(name string, hostConfig *container.HostConfig, validateHostname bool, checkpoint string, checkpointDir string) error
ContainerStop(name string, seconds *int) error
ConnectContainerToNetwork(containerName, networkName string, endpointConfig *network.EndpointSettings) error
UpdateContainerServiceConfig(containerName string, serviceConfig *clustertypes.ServiceConfig) error

2
components/engine/daemon/cluster/executor/container/adapter.go
View File

@ -224,7 +224,7 @@ func (c *containerAdapter) create(ctx context.Context) error {
func (c *containerAdapter) start(ctx context.Context) error {
version := httputils.VersionFromContext(ctx)
validateHostname := versions.GreaterThanOrEqualTo(version, "1.24")
return c.backend.ContainerStart(c.container.name(), nil, validateHostname, "")
return c.backend.ContainerStart(c.container.name(), nil, validateHostname, "", "")
}
func (c *containerAdapter) inspect(ctx context.Context) (types.ContainerJSON, error) {