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

Merge pull request #18721 from tiborvass/remove-dependencies-from-builder

Browse Source 
Remove image and daemon dependencies from builder
Upstream-commit: 64d70de0a2aa29f565336e896b76c23c879a9a98
Component: engine
This commit is contained in:
Vincent Demeester
2015-12-18 17:19:55 +01:00
parent dcc6022170 1f6b8ad3e8
commit 3a6aede7f5
10 changed files with 75 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/api/server/router/container/backend.go
View File

@ -32,7 +32,7 @@ type copyBackend interface {
// stateBackend includes functions to implement to provide container state lifecycle functionality.
type stateBackend interface {
ContainerCreate(params *daemon.ContainerCreateConfig) (types.ContainerCreateResponse, error)
ContainerCreate(types.ContainerCreateConfig) (types.ContainerCreateResponse, error)
ContainerKill(name string, sig uint64) error
ContainerPause(name string) error
ContainerRename(oldName, newName string) error

2
components/engine/api/server/router/container/container_routes.go
View File

@ -339,7 +339,7 @@ func (s *containerRouter) postContainersCreate(ctx context.Context, w http.Respo
version := httputils.VersionFromContext(ctx)
adjustCPUShares := version.LessThan("1.19")
ccr, err := s.backend.ContainerCreate(&daemon.ContainerCreateConfig{
ccr, err := s.backend.ContainerCreate(types.ContainerCreateConfig{
Name: name,
Config: config,
HostConfig: hostConfig,