8936789919
There has been a lot of discussion (issues 4242 and 5262) about making `FROM scratch` either a special case or making `FROM` optional, implying starting from an empty file system. This patch makes the build command `FROM scratch` special cased from now on and if used does not pull/set the the initial layer of the build to the ancient image ID (511136ea..) but instead marks the build as having no base image. The next command in the dockerfile will create an image with a parent image ID of "". This means every image ever can now use one fewer layer! This also makes the image name `scratch` a reserved name by the TagStore. You will not be able to tag an image with this name from now on. If any users currently have an image tagged as `scratch`, they will still be able to use that image, but will not be able to tag a new image with that name. Goodbye '511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158', it was nice knowing you. Fixes #4242 Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
86 lines
2.4 KiB
Go
86 lines
2.4 KiB
Go
package daemon
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/docker/docker/engine"
|
|
"github.com/docker/docker/runconfig"
|
|
)
|
|
|
|
func (daemon *Daemon) ContainerInspect(job *engine.Job) engine.Status {
|
|
if len(job.Args) != 1 {
|
|
return job.Errorf("usage: %s NAME", job.Name)
|
|
}
|
|
name := job.Args[0]
|
|
if container := daemon.Get(name); container != nil {
|
|
container.Lock()
|
|
defer container.Unlock()
|
|
if job.GetenvBool("raw") {
|
|
b, err := json.Marshal(&struct {
|
|
*Container
|
|
HostConfig *runconfig.HostConfig
|
|
}{container, container.hostConfig})
|
|
if err != nil {
|
|
return job.Error(err)
|
|
}
|
|
job.Stdout.Write(b)
|
|
return engine.StatusOK
|
|
}
|
|
|
|
out := &engine.Env{}
|
|
out.SetJson("Id", container.ID)
|
|
out.SetAuto("Created", container.Created)
|
|
out.SetJson("Path", container.Path)
|
|
out.SetList("Args", container.Args)
|
|
out.SetJson("Config", container.Config)
|
|
out.SetJson("State", container.State)
|
|
out.Set("Image", container.ImageID)
|
|
out.SetJson("NetworkSettings", container.NetworkSettings)
|
|
out.Set("ResolvConfPath", container.ResolvConfPath)
|
|
out.Set("HostnamePath", container.HostnamePath)
|
|
out.Set("HostsPath", container.HostsPath)
|
|
out.SetJson("Name", container.Name)
|
|
out.SetInt("RestartCount", container.RestartCount)
|
|
out.Set("Driver", container.Driver)
|
|
out.Set("ExecDriver", container.ExecDriver)
|
|
out.Set("MountLabel", container.MountLabel)
|
|
out.Set("ProcessLabel", container.ProcessLabel)
|
|
out.SetJson("Volumes", container.Volumes)
|
|
out.SetJson("VolumesRW", container.VolumesRW)
|
|
out.SetJson("AppArmorProfile", container.AppArmorProfile)
|
|
|
|
if children, err := daemon.Children(container.Name); err == nil {
|
|
for linkAlias, child := range children {
|
|
container.hostConfig.Links = append(container.hostConfig.Links, fmt.Sprintf("%s:%s", child.Name, linkAlias))
|
|
}
|
|
}
|
|
|
|
out.SetJson("HostConfig", container.hostConfig)
|
|
|
|
container.hostConfig.Links = nil
|
|
if _, err := out.WriteTo(job.Stdout); err != nil {
|
|
return job.Error(err)
|
|
}
|
|
return engine.StatusOK
|
|
}
|
|
return job.Errorf("No such container: %s", name)
|
|
}
|
|
|
|
func (daemon *Daemon) ContainerExecInspect(job *engine.Job) engine.Status {
|
|
if len(job.Args) != 1 {
|
|
return job.Errorf("usage: %s ID", job.Name)
|
|
}
|
|
id := job.Args[0]
|
|
eConfig, err := daemon.getExecConfig(id)
|
|
if err != nil {
|
|
return job.Error(err)
|
|
}
|
|
|
|
b, err := json.Marshal(*eConfig)
|
|
if err != nil {
|
|
return job.Error(err)
|
|
}
|
|
job.Stdout.Write(b)
|
|
return engine.StatusOK
|
|
}
|