69db6279aa
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 commit de4164043546d2b9ee3bf323dbc41f4979c84480, reversing changes made to 7daeecd42d7bb112bfe01532c8c9a962bb0c7967. Signed-off-by: Tibor Vass <tibor@docker.com> Conflicts: api/server/container.go builder/internals.go daemon/container_unix.go daemon/create.go Upstream-commit: b08f071e18043abe8ce15f56826d38dd26bedb78 Component: engine
140 lines
4.0 KiB
Go
140 lines
4.0 KiB
Go
package daemon
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
)
|
|
|
|
// ContainerInspect returns low-level information about a
|
|
// container. Returns an error if the container cannot be found, or if
|
|
// there is an error getting the data.
|
|
func (daemon *Daemon) ContainerInspect(name string) (*types.ContainerJSON, 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
|
|
}
|
|
|
|
mountPoints := addMountPoints(container)
|
|
|
|
return &types.ContainerJSON{base, mountPoints, container.Config}, nil
|
|
}
|
|
|
|
// ContainerInspect120 serializes the master version of a container into a json type.
|
|
func (daemon *Daemon) ContainerInspect120(name string) (*types.ContainerJSON120, 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
|
|
}
|
|
|
|
mountPoints := addMountPoints(container)
|
|
config := &types.ContainerConfig120{
|
|
container.Config,
|
|
container.hostConfig.VolumeDriver,
|
|
}
|
|
|
|
return &types.ContainerJSON120{base, mountPoints, config}, nil
|
|
}
|
|
|
|
func (daemon *Daemon) getInspectData(container *Container) (*types.ContainerJSONBase, error) {
|
|
// make a copy to play with
|
|
hostConfig := *container.hostConfig
|
|
|
|
if children, err := daemon.children(container.Name); err == nil {
|
|
for linkAlias, child := range children {
|
|
hostConfig.Links = append(hostConfig.Links, fmt.Sprintf("%s:%s", child.Name, linkAlias))
|
|
}
|
|
}
|
|
// we need this trick to preserve empty log driver, so
|
|
// container will use daemon defaults even if daemon change them
|
|
if hostConfig.LogConfig.Type == "" {
|
|
hostConfig.LogConfig.Type = daemon.defaultLogConfig.Type
|
|
}
|
|
|
|
if len(hostConfig.LogConfig.Config) == 0 {
|
|
hostConfig.LogConfig.Config = daemon.defaultLogConfig.Config
|
|
}
|
|
|
|
containerState := &types.ContainerState{
|
|
Status: container.State.StateString(),
|
|
Running: container.State.Running,
|
|
Paused: container.State.Paused,
|
|
Restarting: container.State.Restarting,
|
|
OOMKilled: container.State.OOMKilled,
|
|
Dead: container.State.Dead,
|
|
Pid: container.State.Pid,
|
|
ExitCode: container.State.ExitCode,
|
|
Error: container.State.Error,
|
|
StartedAt: container.State.StartedAt.Format(time.RFC3339Nano),
|
|
FinishedAt: container.State.FinishedAt.Format(time.RFC3339Nano),
|
|
}
|
|
|
|
contJSONBase := &types.ContainerJSONBase{
|
|
ID: container.ID,
|
|
Created: container.Created.Format(time.RFC3339Nano),
|
|
Path: container.Path,
|
|
Args: container.Args,
|
|
State: containerState,
|
|
Image: container.ImageID,
|
|
NetworkSettings: container.NetworkSettings,
|
|
LogPath: container.LogPath,
|
|
Name: container.Name,
|
|
RestartCount: container.RestartCount,
|
|
Driver: container.Driver,
|
|
ExecDriver: container.ExecDriver,
|
|
MountLabel: container.MountLabel,
|
|
ProcessLabel: container.ProcessLabel,
|
|
ExecIDs: container.getExecIDs(),
|
|
HostConfig: &hostConfig,
|
|
}
|
|
|
|
// Now set any platform-specific fields
|
|
contJSONBase = setPlatformSpecificContainerFields(container, contJSONBase)
|
|
|
|
contJSONBase.GraphDriver.Name = container.Driver
|
|
graphDriverData, err := daemon.driver.GetMetadata(container.ID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
contJSONBase.GraphDriver.Data = graphDriverData
|
|
|
|
return contJSONBase, nil
|
|
}
|
|
|
|
// ContainerExecInspect returns low-level information about the exec
|
|
// command. An error is returned if the exec cannot be found.
|
|
func (daemon *Daemon) ContainerExecInspect(id string) (*ExecConfig, error) {
|
|
eConfig, err := daemon.getExecConfig(id)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return eConfig, nil
|
|
}
|
|
|
|
// VolumeInspect looks up a volume by name. An error is returned if
|
|
// the volume cannot be found.
|
|
func (daemon *Daemon) VolumeInspect(name string) (*types.Volume, error) {
|
|
v, err := daemon.volumes.Get(name)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return volumeToAPIType(v), nil
|
|
}
|