mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
b08f071e18
Although having a request ID available throughout the codebase is very valuable, the impact of requiring a Context as an argument to every function in the codepath of an API request, is too significant and was not properly understood at the time of the review. Furthermore, mixing API-layer code with non-API-layer code makes the latter usable only by API-layer code (one that has a notion of Context). This reverts commitde41640435, reversing changes made to7daeecd42d. Signed-off-by: Tibor Vass <tibor@docker.com> Conflicts: api/server/container.go builder/internals.go daemon/container_unix.go daemon/create.go
64 lines
1.7 KiB
Go
64 lines
1.7 KiB
Go
// +build !windows
|
|
|
|
package daemon
|
|
|
|
import "github.com/docker/docker/api/types"
|
|
|
|
// This sets platform-specific fields
|
|
func setPlatformSpecificContainerFields(container *Container, contJSONBase *types.ContainerJSONBase) *types.ContainerJSONBase {
|
|
contJSONBase.AppArmorProfile = container.AppArmorProfile
|
|
contJSONBase.ResolvConfPath = container.ResolvConfPath
|
|
contJSONBase.HostnamePath = container.HostnamePath
|
|
contJSONBase.HostsPath = container.HostsPath
|
|
|
|
return contJSONBase
|
|
}
|
|
|
|
// ContainerInspectPre120 gets containers for pre 1.20 APIs.
|
|
func (daemon *Daemon) ContainerInspectPre120(name string) (*types.ContainerJSONPre120, error) {
|
|
container, err := daemon.Get(name)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
container.Lock()
|
|
defer container.Unlock()
|
|
|
|
base, err := daemon.getInspectData(container)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
volumes := make(map[string]string)
|
|
volumesRW := make(map[string]bool)
|
|
for _, m := range container.MountPoints {
|
|
volumes[m.Destination] = m.Path()
|
|
volumesRW[m.Destination] = m.RW
|
|
}
|
|
|
|
config := &types.ContainerConfigPre120{
|
|
container.Config,
|
|
container.hostConfig.VolumeDriver,
|
|
container.hostConfig.Memory,
|
|
container.hostConfig.MemorySwap,
|
|
container.hostConfig.CPUShares,
|
|
container.hostConfig.CpusetCpus,
|
|
}
|
|
|
|
return &types.ContainerJSONPre120{base, volumes, volumesRW, config}, nil
|
|
}
|
|
|
|
func addMountPoints(container *Container) []types.MountPoint {
|
|
mountPoints := make([]types.MountPoint, 0, len(container.MountPoints))
|
|
for _, m := range container.MountPoints {
|
|
mountPoints = append(mountPoints, types.MountPoint{
|
|
Name: m.Name,
|
|
Source: m.Path(),
|
|
Destination: m.Destination,
|
|
Driver: m.Driver,
|
|
Mode: m.Mode,
|
|
RW: m.RW,
|
|
})
|
|
}
|
|
return mountPoints
|
|
}
|