mirror of https://github.com/docker/docs.git
Merge pull request #12884 from Microsoft/10662-startcontainerrefactor
Windows: Refactor container
This commit is contained in:
commit
0cc5da0635
|
@ -1,22 +1,18 @@
|
||||||
package daemon
|
package daemon
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/libcontainer/configs"
|
|
||||||
"github.com/docker/libcontainer/devices"
|
|
||||||
"github.com/docker/libcontainer/label"
|
"github.com/docker/libcontainer/label"
|
||||||
|
|
||||||
"github.com/Sirupsen/logrus"
|
"github.com/Sirupsen/logrus"
|
||||||
|
@ -24,27 +20,17 @@ import (
|
||||||
"github.com/docker/docker/daemon/logger"
|
"github.com/docker/docker/daemon/logger"
|
||||||
"github.com/docker/docker/daemon/logger/jsonfilelog"
|
"github.com/docker/docker/daemon/logger/jsonfilelog"
|
||||||
"github.com/docker/docker/daemon/network"
|
"github.com/docker/docker/daemon/network"
|
||||||
"github.com/docker/docker/daemon/networkdriver/bridge"
|
|
||||||
"github.com/docker/docker/image"
|
"github.com/docker/docker/image"
|
||||||
"github.com/docker/docker/links"
|
|
||||||
"github.com/docker/docker/nat"
|
"github.com/docker/docker/nat"
|
||||||
"github.com/docker/docker/pkg/archive"
|
"github.com/docker/docker/pkg/archive"
|
||||||
"github.com/docker/docker/pkg/broadcastwriter"
|
"github.com/docker/docker/pkg/broadcastwriter"
|
||||||
"github.com/docker/docker/pkg/directory"
|
|
||||||
"github.com/docker/docker/pkg/etchosts"
|
|
||||||
"github.com/docker/docker/pkg/ioutils"
|
"github.com/docker/docker/pkg/ioutils"
|
||||||
"github.com/docker/docker/pkg/jsonlog"
|
"github.com/docker/docker/pkg/jsonlog"
|
||||||
"github.com/docker/docker/pkg/promise"
|
"github.com/docker/docker/pkg/promise"
|
||||||
"github.com/docker/docker/pkg/resolvconf"
|
|
||||||
"github.com/docker/docker/pkg/stringid"
|
|
||||||
"github.com/docker/docker/pkg/symlink"
|
"github.com/docker/docker/pkg/symlink"
|
||||||
"github.com/docker/docker/pkg/ulimit"
|
|
||||||
"github.com/docker/docker/runconfig"
|
"github.com/docker/docker/runconfig"
|
||||||
"github.com/docker/docker/utils"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const DefaultPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrNotATTY = errors.New("The PTY is not a file")
|
ErrNotATTY = errors.New("The PTY is not a file")
|
||||||
ErrNoTTY = errors.New("No PTY found")
|
ErrNoTTY = errors.New("No PTY found")
|
||||||
|
@ -59,7 +45,9 @@ type StreamConfig struct {
|
||||||
stdinPipe io.WriteCloser
|
stdinPipe io.WriteCloser
|
||||||
}
|
}
|
||||||
|
|
||||||
type Container struct {
|
// CommonContainer holds the settings for a container which are applicable
|
||||||
|
// across all platforms supported by the daemon.
|
||||||
|
type CommonContainer struct {
|
||||||
*State `json:"State"` // Needed for remote api version <= 1.11
|
*State `json:"State"` // Needed for remote api version <= 1.11
|
||||||
root string // Path to the "home" of the container, including metadata.
|
root string // Path to the "home" of the container, including metadata.
|
||||||
basefs string // Path to the graphdriver mountpoint
|
basefs string // Path to the graphdriver mountpoint
|
||||||
|
@ -89,26 +77,20 @@ type Container struct {
|
||||||
|
|
||||||
daemon *Daemon
|
daemon *Daemon
|
||||||
MountLabel, ProcessLabel string
|
MountLabel, ProcessLabel string
|
||||||
AppArmorProfile string
|
|
||||||
RestartCount int
|
RestartCount int
|
||||||
UpdateDns bool
|
UpdateDns bool
|
||||||
|
|
||||||
// Maps container paths to volume paths. The key in this is the path to which
|
// Maps container paths to volume paths. The key in this is the path to which
|
||||||
// the volume is being mounted inside the container. Value is the path of the
|
// the volume is being mounted inside the container. Value is the path of the
|
||||||
// volume on disk
|
// volume on disk
|
||||||
Volumes map[string]string
|
Volumes map[string]string
|
||||||
// Store rw/ro in a separate structure to preserve reverse-compatibility on-disk.
|
|
||||||
// Easier than migrating older container configs :)
|
|
||||||
VolumesRW map[string]bool
|
|
||||||
hostConfig *runconfig.HostConfig
|
hostConfig *runconfig.HostConfig
|
||||||
|
|
||||||
activeLinks map[string]*links.Link
|
|
||||||
monitor *containerMonitor
|
monitor *containerMonitor
|
||||||
execCommands *execStore
|
execCommands *execStore
|
||||||
// logDriver for closing
|
// logDriver for closing
|
||||||
logDriver logger.Logger
|
logDriver logger.Logger
|
||||||
logCopier *logger.Copier
|
logCopier *logger.Copier
|
||||||
AppliedVolumesFrom map[string]struct{}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (container *Container) FromDisk() error {
|
func (container *Container) FromDisk() error {
|
||||||
|
@ -244,193 +226,6 @@ func (container *Container) GetRootResourcePath(path string) (string, error) {
|
||||||
return symlink.FollowSymlinkInScope(filepath.Join(container.root, cleanPath), container.root)
|
return symlink.FollowSymlinkInScope(filepath.Join(container.root, cleanPath), container.root)
|
||||||
}
|
}
|
||||||
|
|
||||||
func getDevicesFromPath(deviceMapping runconfig.DeviceMapping) (devs []*configs.Device, err error) {
|
|
||||||
device, err := devices.DeviceFromPath(deviceMapping.PathOnHost, deviceMapping.CgroupPermissions)
|
|
||||||
// if there was no error, return the device
|
|
||||||
if err == nil {
|
|
||||||
device.Path = deviceMapping.PathInContainer
|
|
||||||
return append(devs, device), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// if the device is not a device node
|
|
||||||
// try to see if it's a directory holding many devices
|
|
||||||
if err == devices.ErrNotADevice {
|
|
||||||
|
|
||||||
// check if it is a directory
|
|
||||||
if src, e := os.Stat(deviceMapping.PathOnHost); e == nil && src.IsDir() {
|
|
||||||
|
|
||||||
// mount the internal devices recursively
|
|
||||||
filepath.Walk(deviceMapping.PathOnHost, func(dpath string, f os.FileInfo, e error) error {
|
|
||||||
childDevice, e := devices.DeviceFromPath(dpath, deviceMapping.CgroupPermissions)
|
|
||||||
if e != nil {
|
|
||||||
// ignore the device
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// add the device to userSpecified devices
|
|
||||||
childDevice.Path = strings.Replace(dpath, deviceMapping.PathOnHost, deviceMapping.PathInContainer, 1)
|
|
||||||
devs = append(devs, childDevice)
|
|
||||||
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(devs) > 0 {
|
|
||||||
return devs, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return devs, fmt.Errorf("error gathering device information while adding custom device %q: %s", deviceMapping.PathOnHost, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func populateCommand(c *Container, env []string) error {
|
|
||||||
en := &execdriver.Network{
|
|
||||||
Mtu: c.daemon.config.Mtu,
|
|
||||||
Interface: nil,
|
|
||||||
}
|
|
||||||
|
|
||||||
parts := strings.SplitN(string(c.hostConfig.NetworkMode), ":", 2)
|
|
||||||
switch parts[0] {
|
|
||||||
case "none":
|
|
||||||
case "host":
|
|
||||||
en.HostNetworking = true
|
|
||||||
case "bridge", "": // empty string to support existing containers
|
|
||||||
if !c.Config.NetworkDisabled {
|
|
||||||
network := c.NetworkSettings
|
|
||||||
en.Interface = &execdriver.NetworkInterface{
|
|
||||||
Gateway: network.Gateway,
|
|
||||||
Bridge: network.Bridge,
|
|
||||||
IPAddress: network.IPAddress,
|
|
||||||
IPPrefixLen: network.IPPrefixLen,
|
|
||||||
MacAddress: network.MacAddress,
|
|
||||||
LinkLocalIPv6Address: network.LinkLocalIPv6Address,
|
|
||||||
GlobalIPv6Address: network.GlobalIPv6Address,
|
|
||||||
GlobalIPv6PrefixLen: network.GlobalIPv6PrefixLen,
|
|
||||||
IPv6Gateway: network.IPv6Gateway,
|
|
||||||
HairpinMode: network.HairpinMode,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case "container":
|
|
||||||
nc, err := c.getNetworkedContainer()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
en.ContainerID = nc.ID
|
|
||||||
default:
|
|
||||||
return fmt.Errorf("invalid network mode: %s", c.hostConfig.NetworkMode)
|
|
||||||
}
|
|
||||||
|
|
||||||
ipc := &execdriver.Ipc{}
|
|
||||||
|
|
||||||
if c.hostConfig.IpcMode.IsContainer() {
|
|
||||||
ic, err := c.getIpcContainer()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
ipc.ContainerID = ic.ID
|
|
||||||
} else {
|
|
||||||
ipc.HostIpc = c.hostConfig.IpcMode.IsHost()
|
|
||||||
}
|
|
||||||
|
|
||||||
pid := &execdriver.Pid{}
|
|
||||||
pid.HostPid = c.hostConfig.PidMode.IsHost()
|
|
||||||
|
|
||||||
uts := &execdriver.UTS{
|
|
||||||
HostUTS: c.hostConfig.UTSMode.IsHost(),
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build lists of devices allowed and created within the container.
|
|
||||||
var userSpecifiedDevices []*configs.Device
|
|
||||||
for _, deviceMapping := range c.hostConfig.Devices {
|
|
||||||
devs, err := getDevicesFromPath(deviceMapping)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
userSpecifiedDevices = append(userSpecifiedDevices, devs...)
|
|
||||||
}
|
|
||||||
allowedDevices := append(configs.DefaultAllowedDevices, userSpecifiedDevices...)
|
|
||||||
|
|
||||||
autoCreatedDevices := append(configs.DefaultAutoCreatedDevices, userSpecifiedDevices...)
|
|
||||||
|
|
||||||
// TODO: this can be removed after lxc-conf is fully deprecated
|
|
||||||
lxcConfig, err := mergeLxcConfIntoOptions(c.hostConfig)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
var rlimits []*ulimit.Rlimit
|
|
||||||
ulimits := c.hostConfig.Ulimits
|
|
||||||
|
|
||||||
// Merge ulimits with daemon defaults
|
|
||||||
ulIdx := make(map[string]*ulimit.Ulimit)
|
|
||||||
for _, ul := range ulimits {
|
|
||||||
ulIdx[ul.Name] = ul
|
|
||||||
}
|
|
||||||
for name, ul := range c.daemon.config.Ulimits {
|
|
||||||
if _, exists := ulIdx[name]; !exists {
|
|
||||||
ulimits = append(ulimits, ul)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, limit := range ulimits {
|
|
||||||
rl, err := limit.GetRlimit()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
rlimits = append(rlimits, rl)
|
|
||||||
}
|
|
||||||
|
|
||||||
resources := &execdriver.Resources{
|
|
||||||
Memory: c.hostConfig.Memory,
|
|
||||||
MemorySwap: c.hostConfig.MemorySwap,
|
|
||||||
CpuShares: c.hostConfig.CpuShares,
|
|
||||||
CpusetCpus: c.hostConfig.CpusetCpus,
|
|
||||||
CpusetMems: c.hostConfig.CpusetMems,
|
|
||||||
CpuPeriod: c.hostConfig.CpuPeriod,
|
|
||||||
CpuQuota: c.hostConfig.CpuQuota,
|
|
||||||
BlkioWeight: c.hostConfig.BlkioWeight,
|
|
||||||
Rlimits: rlimits,
|
|
||||||
OomKillDisable: c.hostConfig.OomKillDisable,
|
|
||||||
}
|
|
||||||
|
|
||||||
processConfig := execdriver.ProcessConfig{
|
|
||||||
Privileged: c.hostConfig.Privileged,
|
|
||||||
Entrypoint: c.Path,
|
|
||||||
Arguments: c.Args,
|
|
||||||
Tty: c.Config.Tty,
|
|
||||||
User: c.Config.User,
|
|
||||||
}
|
|
||||||
|
|
||||||
processConfig.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
|
|
||||||
processConfig.Env = env
|
|
||||||
|
|
||||||
c.command = &execdriver.Command{
|
|
||||||
ID: c.ID,
|
|
||||||
Rootfs: c.RootfsPath(),
|
|
||||||
ReadonlyRootfs: c.hostConfig.ReadonlyRootfs,
|
|
||||||
InitPath: "/.dockerinit",
|
|
||||||
WorkingDir: c.Config.WorkingDir,
|
|
||||||
Network: en,
|
|
||||||
Ipc: ipc,
|
|
||||||
Pid: pid,
|
|
||||||
UTS: uts,
|
|
||||||
Resources: resources,
|
|
||||||
AllowedDevices: allowedDevices,
|
|
||||||
AutoCreatedDevices: autoCreatedDevices,
|
|
||||||
CapAdd: c.hostConfig.CapAdd,
|
|
||||||
CapDrop: c.hostConfig.CapDrop,
|
|
||||||
ProcessConfig: processConfig,
|
|
||||||
ProcessLabel: c.GetProcessLabel(),
|
|
||||||
MountLabel: c.GetMountLabel(),
|
|
||||||
LxcConfig: lxcConfig,
|
|
||||||
AppArmorProfile: c.AppArmorProfile,
|
|
||||||
CgroupParent: c.hostConfig.CgroupParent,
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) Start() (err error) {
|
func (container *Container) Start() (err error) {
|
||||||
container.Lock()
|
container.Lock()
|
||||||
defer container.Unlock()
|
defer container.Unlock()
|
||||||
|
@ -546,183 +341,16 @@ func (streamConfig *StreamConfig) StderrLogPipe() io.ReadCloser {
|
||||||
return ioutils.NewBufReader(reader)
|
return ioutils.NewBufReader(reader)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (container *Container) buildHostnameFile() error {
|
|
||||||
hostnamePath, err := container.GetRootResourcePath("hostname")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
container.HostnamePath = hostnamePath
|
|
||||||
|
|
||||||
if container.Config.Domainname != "" {
|
|
||||||
return ioutil.WriteFile(container.HostnamePath, []byte(fmt.Sprintf("%s.%s\n", container.Config.Hostname, container.Config.Domainname)), 0644)
|
|
||||||
}
|
|
||||||
return ioutil.WriteFile(container.HostnamePath, []byte(container.Config.Hostname+"\n"), 0644)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) buildHostsFiles(IP string) error {
|
|
||||||
|
|
||||||
hostsPath, err := container.GetRootResourcePath("hosts")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
container.HostsPath = hostsPath
|
|
||||||
|
|
||||||
var extraContent []etchosts.Record
|
|
||||||
|
|
||||||
children, err := container.daemon.Children(container.Name)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
for linkAlias, child := range children {
|
|
||||||
_, alias := path.Split(linkAlias)
|
|
||||||
// allow access to the linked container via the alias, real name, and container hostname
|
|
||||||
aliasList := alias + " " + child.Config.Hostname
|
|
||||||
// only add the name if alias isn't equal to the name
|
|
||||||
if alias != child.Name[1:] {
|
|
||||||
aliasList = aliasList + " " + child.Name[1:]
|
|
||||||
}
|
|
||||||
extraContent = append(extraContent, etchosts.Record{Hosts: aliasList, IP: child.NetworkSettings.IPAddress})
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, extraHost := range container.hostConfig.ExtraHosts {
|
|
||||||
// allow IPv6 addresses in extra hosts; only split on first ":"
|
|
||||||
parts := strings.SplitN(extraHost, ":", 2)
|
|
||||||
extraContent = append(extraContent, etchosts.Record{Hosts: parts[0], IP: parts[1]})
|
|
||||||
}
|
|
||||||
|
|
||||||
return etchosts.Build(container.HostsPath, IP, container.Config.Hostname, container.Config.Domainname, extraContent)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) buildHostnameAndHostsFiles(IP string) error {
|
|
||||||
if err := container.buildHostnameFile(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return container.buildHostsFiles(IP)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) AllocateNetwork() error {
|
|
||||||
mode := container.hostConfig.NetworkMode
|
|
||||||
if container.Config.NetworkDisabled || !mode.IsPrivate() {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var err error
|
|
||||||
|
|
||||||
networkSettings, err := bridge.Allocate(container.ID, container.Config.MacAddress, "", "")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Error handling: At this point, the interface is allocated so we have to
|
|
||||||
// make sure that it is always released in case of error, otherwise we
|
|
||||||
// might leak resources.
|
|
||||||
|
|
||||||
if container.Config.PortSpecs != nil {
|
|
||||||
if err = migratePortMappings(container.Config, container.hostConfig); err != nil {
|
|
||||||
bridge.Release(container.ID)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
container.Config.PortSpecs = nil
|
|
||||||
if err = container.WriteHostConfig(); err != nil {
|
|
||||||
bridge.Release(container.ID)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
portSpecs = make(nat.PortSet)
|
|
||||||
bindings = make(nat.PortMap)
|
|
||||||
)
|
|
||||||
|
|
||||||
if container.Config.ExposedPorts != nil {
|
|
||||||
portSpecs = container.Config.ExposedPorts
|
|
||||||
}
|
|
||||||
|
|
||||||
if container.hostConfig.PortBindings != nil {
|
|
||||||
for p, b := range container.hostConfig.PortBindings {
|
|
||||||
bindings[p] = []nat.PortBinding{}
|
|
||||||
for _, bb := range b {
|
|
||||||
bindings[p] = append(bindings[p], nat.PortBinding{
|
|
||||||
HostIp: bb.HostIp,
|
|
||||||
HostPort: bb.HostPort,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
container.NetworkSettings.PortMapping = nil
|
|
||||||
|
|
||||||
ports := make([]nat.Port, len(portSpecs))
|
|
||||||
var i int
|
|
||||||
for p := range portSpecs {
|
|
||||||
ports[i] = p
|
|
||||||
i++
|
|
||||||
}
|
|
||||||
nat.SortPortMap(ports, bindings)
|
|
||||||
for _, port := range ports {
|
|
||||||
if err = container.allocatePort(port, bindings); err != nil {
|
|
||||||
bridge.Release(container.ID)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
container.WriteHostConfig()
|
|
||||||
|
|
||||||
networkSettings.Ports = bindings
|
|
||||||
container.NetworkSettings = networkSettings
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) ReleaseNetwork() {
|
|
||||||
if container.Config.NetworkDisabled || !container.hostConfig.NetworkMode.IsPrivate() {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
bridge.Release(container.ID)
|
|
||||||
|
|
||||||
container.NetworkSettings = &network.Settings{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) isNetworkAllocated() bool {
|
func (container *Container) isNetworkAllocated() bool {
|
||||||
return container.NetworkSettings.IPAddress != ""
|
return container.NetworkSettings.IPAddress != ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (container *Container) RestoreNetwork() error {
|
|
||||||
mode := container.hostConfig.NetworkMode
|
|
||||||
// Don't attempt a restore if we previously didn't allocate networking.
|
|
||||||
// This might be a legacy container with no network allocated, in which case the
|
|
||||||
// allocation will happen once and for all at start.
|
|
||||||
if !container.isNetworkAllocated() || container.Config.NetworkDisabled || !mode.IsPrivate() {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Re-allocate the interface with the same IP and MAC address.
|
|
||||||
if _, err := bridge.Allocate(container.ID, container.NetworkSettings.MacAddress, container.NetworkSettings.IPAddress, ""); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Re-allocate any previously allocated ports.
|
|
||||||
for port := range container.NetworkSettings.Ports {
|
|
||||||
if err := container.allocatePort(port, container.NetworkSettings.Ports); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// cleanup releases any network resources allocated to the container along with any rules
|
// cleanup releases any network resources allocated to the container along with any rules
|
||||||
// around how containers are linked together. It also unmounts the container's root filesystem.
|
// around how containers are linked together. It also unmounts the container's root filesystem.
|
||||||
func (container *Container) cleanup() {
|
func (container *Container) cleanup() {
|
||||||
container.ReleaseNetwork()
|
container.ReleaseNetwork()
|
||||||
|
|
||||||
// Disable all active links
|
disableAllActiveLinks(container)
|
||||||
if container.activeLinks != nil {
|
|
||||||
for _, link := range container.activeLinks {
|
|
||||||
link.Disable()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := container.Unmount(); err != nil {
|
if err := container.Unmount(); err != nil {
|
||||||
logrus.Errorf("%v: Failed to umount filesystem: %v", container.ID, err)
|
logrus.Errorf("%v: Failed to umount filesystem: %v", container.ID, err)
|
||||||
|
@ -824,17 +452,8 @@ func (container *Container) Kill() error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Wait for the process to die, in last resort, try to kill the process directly
|
// 2. Wait for the process to die, in last resort, try to kill the process directly
|
||||||
if _, err := container.WaitStop(10 * time.Second); err != nil {
|
if err := killProcessDirectly(container); err != nil {
|
||||||
// Ensure that we don't kill ourselves
|
return err
|
||||||
if pid := container.GetPid(); pid != 0 {
|
|
||||||
logrus.Infof("Container %s failed to exit within 10 seconds of kill - trying direct SIGKILL", stringid.TruncateID(container.ID))
|
|
||||||
if err := syscall.Kill(pid, 9); err != nil {
|
|
||||||
if err != syscall.ESRCH {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
logrus.Debugf("Cannot kill process (pid=%d) with signal 9: no such process.", pid)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
container.WaitStop(-1 * time.Second)
|
container.WaitStop(-1 * time.Second)
|
||||||
|
@ -887,26 +506,6 @@ func (container *Container) Resize(h, w int) error {
|
||||||
return container.command.ProcessConfig.Terminal.Resize(h, w)
|
return container.command.ProcessConfig.Terminal.Resize(h, w)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (container *Container) ExportRw() (archive.Archive, error) {
|
|
||||||
if err := container.Mount(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if container.daemon == nil {
|
|
||||||
return nil, fmt.Errorf("Can't load storage driver for unregistered container %s", container.ID)
|
|
||||||
}
|
|
||||||
archive, err := container.daemon.Diff(container)
|
|
||||||
if err != nil {
|
|
||||||
container.Unmount()
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return ioutils.NewReadCloserWrapper(archive, func() error {
|
|
||||||
err := archive.Close()
|
|
||||||
container.Unmount()
|
|
||||||
return err
|
|
||||||
}),
|
|
||||||
nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) Export() (archive.Archive, error) {
|
func (container *Container) Export() (archive.Archive, error) {
|
||||||
if err := container.Mount(); err != nil {
|
if err := container.Mount(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -971,37 +570,6 @@ func validateID(id string) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetSize, return real size, virtual size
|
|
||||||
func (container *Container) GetSize() (int64, int64) {
|
|
||||||
var (
|
|
||||||
sizeRw, sizeRootfs int64
|
|
||||||
err error
|
|
||||||
driver = container.daemon.driver
|
|
||||||
)
|
|
||||||
|
|
||||||
if err := container.Mount(); err != nil {
|
|
||||||
logrus.Errorf("Failed to compute size of container rootfs %s: %s", container.ID, err)
|
|
||||||
return sizeRw, sizeRootfs
|
|
||||||
}
|
|
||||||
defer container.Unmount()
|
|
||||||
|
|
||||||
initID := fmt.Sprintf("%s-init", container.ID)
|
|
||||||
sizeRw, err = driver.DiffSize(container.ID, initID)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Errorf("Driver %s couldn't return diff size of container %s: %s", driver, container.ID, err)
|
|
||||||
// FIXME: GetSize should return an error. Not changing it now in case
|
|
||||||
// there is a side-effect.
|
|
||||||
sizeRw = -1
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err = os.Stat(container.basefs); err != nil {
|
|
||||||
if sizeRootfs, err = directory.Size(container.basefs); err != nil {
|
|
||||||
sizeRootfs = -1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return sizeRw, sizeRootfs
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) Copy(resource string) (io.ReadCloser, error) {
|
func (container *Container) Copy(resource string) (io.ReadCloser, error) {
|
||||||
container.Lock()
|
container.Lock()
|
||||||
defer container.Unlock()
|
defer container.Unlock()
|
||||||
|
@ -1036,12 +604,12 @@ func (container *Container) Copy(resource string) (io.ReadCloser, error) {
|
||||||
}
|
}
|
||||||
var filter []string
|
var filter []string
|
||||||
if !stat.IsDir() {
|
if !stat.IsDir() {
|
||||||
d, f := path.Split(basePath)
|
d, f := filepath.Split(basePath)
|
||||||
basePath = d
|
basePath = d
|
||||||
filter = []string{f}
|
filter = []string{f}
|
||||||
} else {
|
} else {
|
||||||
filter = []string{path.Base(basePath)}
|
filter = []string{filepath.Base(basePath)}
|
||||||
basePath = path.Dir(basePath)
|
basePath = filepath.Dir(basePath)
|
||||||
}
|
}
|
||||||
|
|
||||||
archive, err := archive.TarWithOptions(basePath, &archive.TarOptions{
|
archive, err := archive.TarWithOptions(basePath, &archive.TarOptions{
|
||||||
|
@ -1075,367 +643,6 @@ func (container *Container) SetHostConfig(hostConfig *runconfig.HostConfig) {
|
||||||
container.hostConfig = hostConfig
|
container.hostConfig = hostConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
func (container *Container) DisableLink(name string) {
|
|
||||||
if container.activeLinks != nil {
|
|
||||||
if link, exists := container.activeLinks[name]; exists {
|
|
||||||
link.Disable()
|
|
||||||
} else {
|
|
||||||
logrus.Debugf("Could not find active link for %s", name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) setupContainerDns() error {
|
|
||||||
if container.ResolvConfPath != "" {
|
|
||||||
// check if this is an existing container that needs DNS update:
|
|
||||||
if container.UpdateDns {
|
|
||||||
// read the host's resolv.conf, get the hash and call updateResolvConf
|
|
||||||
logrus.Debugf("Check container (%s) for update to resolv.conf - UpdateDns flag was set", container.ID)
|
|
||||||
latestResolvConf, latestHash := resolvconf.GetLastModified()
|
|
||||||
|
|
||||||
// clean container resolv.conf re: localhost nameservers and IPv6 NS (if IPv6 disabled)
|
|
||||||
updatedResolvConf, modified := resolvconf.FilterResolvDns(latestResolvConf, container.daemon.config.Bridge.EnableIPv6)
|
|
||||||
if modified {
|
|
||||||
// changes have occurred during resolv.conf localhost cleanup: generate an updated hash
|
|
||||||
newHash, err := ioutils.HashData(bytes.NewReader(updatedResolvConf))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
latestHash = newHash
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := container.updateResolvConf(updatedResolvConf, latestHash); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
// successful update of the restarting container; set the flag off
|
|
||||||
container.UpdateDns = false
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
config = container.hostConfig
|
|
||||||
daemon = container.daemon
|
|
||||||
)
|
|
||||||
|
|
||||||
resolvConf, err := resolvconf.Get()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
container.ResolvConfPath, err = container.GetRootResourcePath("resolv.conf")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if config.NetworkMode.IsBridge() || config.NetworkMode.IsNone() {
|
|
||||||
// check configurations for any container/daemon dns settings
|
|
||||||
if len(config.Dns) > 0 || len(daemon.config.Dns) > 0 || len(config.DnsSearch) > 0 || len(daemon.config.DnsSearch) > 0 {
|
|
||||||
var (
|
|
||||||
dns = resolvconf.GetNameservers(resolvConf)
|
|
||||||
dnsSearch = resolvconf.GetSearchDomains(resolvConf)
|
|
||||||
)
|
|
||||||
if len(config.Dns) > 0 {
|
|
||||||
dns = config.Dns
|
|
||||||
} else if len(daemon.config.Dns) > 0 {
|
|
||||||
dns = daemon.config.Dns
|
|
||||||
}
|
|
||||||
if len(config.DnsSearch) > 0 {
|
|
||||||
dnsSearch = config.DnsSearch
|
|
||||||
} else if len(daemon.config.DnsSearch) > 0 {
|
|
||||||
dnsSearch = daemon.config.DnsSearch
|
|
||||||
}
|
|
||||||
return resolvconf.Build(container.ResolvConfPath, dns, dnsSearch)
|
|
||||||
}
|
|
||||||
|
|
||||||
// replace any localhost/127.*, and remove IPv6 nameservers if IPv6 disabled in daemon
|
|
||||||
resolvConf, _ = resolvconf.FilterResolvDns(resolvConf, daemon.config.Bridge.EnableIPv6)
|
|
||||||
}
|
|
||||||
//get a sha256 hash of the resolv conf at this point so we can check
|
|
||||||
//for changes when the host resolv.conf changes (e.g. network update)
|
|
||||||
resolvHash, err := ioutils.HashData(bytes.NewReader(resolvConf))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
resolvHashFile := container.ResolvConfPath + ".hash"
|
|
||||||
if err = ioutil.WriteFile(resolvHashFile, []byte(resolvHash), 0644); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return ioutil.WriteFile(container.ResolvConfPath, resolvConf, 0644)
|
|
||||||
}
|
|
||||||
|
|
||||||
// called when the host's resolv.conf changes to check whether container's resolv.conf
|
|
||||||
// is unchanged by the container "user" since container start: if unchanged, the
|
|
||||||
// container's resolv.conf will be updated to match the host's new resolv.conf
|
|
||||||
func (container *Container) updateResolvConf(updatedResolvConf []byte, newResolvHash string) error {
|
|
||||||
|
|
||||||
if container.ResolvConfPath == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if container.Running {
|
|
||||||
//set a marker in the hostConfig to update on next start/restart
|
|
||||||
container.UpdateDns = true
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
resolvHashFile := container.ResolvConfPath + ".hash"
|
|
||||||
|
|
||||||
//read the container's current resolv.conf and compute the hash
|
|
||||||
resolvBytes, err := ioutil.ReadFile(container.ResolvConfPath)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
curHash, err := ioutils.HashData(bytes.NewReader(resolvBytes))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
//read the hash from the last time we wrote resolv.conf in the container
|
|
||||||
hashBytes, err := ioutil.ReadFile(resolvHashFile)
|
|
||||||
if err != nil {
|
|
||||||
if !os.IsNotExist(err) {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
// backwards compat: if no hash file exists, this container pre-existed from
|
|
||||||
// a Docker daemon that didn't contain this update feature. Given we can't know
|
|
||||||
// if the user has modified the resolv.conf since container start time, safer
|
|
||||||
// to just never update the container's resolv.conf during it's lifetime which
|
|
||||||
// we can control by setting hashBytes to an empty string
|
|
||||||
hashBytes = []byte("")
|
|
||||||
}
|
|
||||||
|
|
||||||
//if the user has not modified the resolv.conf of the container since we wrote it last
|
|
||||||
//we will replace it with the updated resolv.conf from the host
|
|
||||||
if string(hashBytes) == curHash {
|
|
||||||
logrus.Debugf("replacing %q with updated host resolv.conf", container.ResolvConfPath)
|
|
||||||
|
|
||||||
// for atomic updates to these files, use temporary files with os.Rename:
|
|
||||||
dir := path.Dir(container.ResolvConfPath)
|
|
||||||
tmpHashFile, err := ioutil.TempFile(dir, "hash")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
tmpResolvFile, err := ioutil.TempFile(dir, "resolv")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// write the updates to the temp files
|
|
||||||
if err = ioutil.WriteFile(tmpHashFile.Name(), []byte(newResolvHash), 0644); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err = ioutil.WriteFile(tmpResolvFile.Name(), updatedResolvConf, 0644); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// rename the temp files for atomic replace
|
|
||||||
if err = os.Rename(tmpHashFile.Name(), resolvHashFile); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return os.Rename(tmpResolvFile.Name(), container.ResolvConfPath)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) updateParentsHosts() error {
|
|
||||||
refs := container.daemon.ContainerGraph().RefPaths(container.ID)
|
|
||||||
for _, ref := range refs {
|
|
||||||
if ref.ParentID == "0" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
c, err := container.daemon.Get(ref.ParentID)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Error(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if c != nil && !container.daemon.config.DisableNetwork && container.hostConfig.NetworkMode.IsPrivate() {
|
|
||||||
logrus.Debugf("Update /etc/hosts of %s for alias %s with ip %s", c.ID, ref.Name, container.NetworkSettings.IPAddress)
|
|
||||||
if err := etchosts.Update(c.HostsPath, container.NetworkSettings.IPAddress, ref.Name); err != nil {
|
|
||||||
logrus.Errorf("Failed to update /etc/hosts in parent container %s for alias %s: %v", c.ID, ref.Name, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) initializeNetworking() error {
|
|
||||||
var err error
|
|
||||||
if container.hostConfig.NetworkMode.IsHost() {
|
|
||||||
container.Config.Hostname, err = os.Hostname()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
parts := strings.SplitN(container.Config.Hostname, ".", 2)
|
|
||||||
if len(parts) > 1 {
|
|
||||||
container.Config.Hostname = parts[0]
|
|
||||||
container.Config.Domainname = parts[1]
|
|
||||||
}
|
|
||||||
|
|
||||||
content, err := ioutil.ReadFile("/etc/hosts")
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
return container.buildHostnameAndHostsFiles("")
|
|
||||||
} else if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := container.buildHostnameFile(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
hostsPath, err := container.GetRootResourcePath("hosts")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
container.HostsPath = hostsPath
|
|
||||||
|
|
||||||
return ioutil.WriteFile(container.HostsPath, content, 0644)
|
|
||||||
}
|
|
||||||
if container.hostConfig.NetworkMode.IsContainer() {
|
|
||||||
// we need to get the hosts files from the container to join
|
|
||||||
nc, err := container.getNetworkedContainer()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
container.HostnamePath = nc.HostnamePath
|
|
||||||
container.HostsPath = nc.HostsPath
|
|
||||||
container.ResolvConfPath = nc.ResolvConfPath
|
|
||||||
container.Config.Hostname = nc.Config.Hostname
|
|
||||||
container.Config.Domainname = nc.Config.Domainname
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if container.daemon.config.DisableNetwork {
|
|
||||||
container.Config.NetworkDisabled = true
|
|
||||||
return container.buildHostnameAndHostsFiles("127.0.1.1")
|
|
||||||
}
|
|
||||||
if err := container.AllocateNetwork(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return container.buildHostnameAndHostsFiles(container.NetworkSettings.IPAddress)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Make sure the config is compatible with the current kernel
|
|
||||||
func (container *Container) verifyDaemonSettings() {
|
|
||||||
if container.hostConfig.Memory > 0 && !container.daemon.sysInfo.MemoryLimit {
|
|
||||||
logrus.Warnf("Your kernel does not support memory limit capabilities. Limitation discarded.")
|
|
||||||
container.hostConfig.Memory = 0
|
|
||||||
}
|
|
||||||
if container.hostConfig.Memory > 0 && container.hostConfig.MemorySwap != -1 && !container.daemon.sysInfo.SwapLimit {
|
|
||||||
logrus.Warnf("Your kernel does not support swap limit capabilities. Limitation discarded.")
|
|
||||||
container.hostConfig.MemorySwap = -1
|
|
||||||
}
|
|
||||||
if container.daemon.sysInfo.IPv4ForwardingDisabled {
|
|
||||||
logrus.Warnf("IPv4 forwarding is disabled. Networking will not work")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) setupLinkedContainers() ([]string, error) {
|
|
||||||
var (
|
|
||||||
env []string
|
|
||||||
daemon = container.daemon
|
|
||||||
)
|
|
||||||
children, err := daemon.Children(container.Name)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(children) > 0 {
|
|
||||||
container.activeLinks = make(map[string]*links.Link, len(children))
|
|
||||||
|
|
||||||
// If we encounter an error make sure that we rollback any network
|
|
||||||
// config and iptables changes
|
|
||||||
rollback := func() {
|
|
||||||
for _, link := range container.activeLinks {
|
|
||||||
link.Disable()
|
|
||||||
}
|
|
||||||
container.activeLinks = nil
|
|
||||||
}
|
|
||||||
|
|
||||||
for linkAlias, child := range children {
|
|
||||||
if !child.IsRunning() {
|
|
||||||
return nil, fmt.Errorf("Cannot link to a non running container: %s AS %s", child.Name, linkAlias)
|
|
||||||
}
|
|
||||||
|
|
||||||
link, err := links.NewLink(
|
|
||||||
container.NetworkSettings.IPAddress,
|
|
||||||
child.NetworkSettings.IPAddress,
|
|
||||||
linkAlias,
|
|
||||||
child.Config.Env,
|
|
||||||
child.Config.ExposedPorts,
|
|
||||||
)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
rollback()
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
container.activeLinks[link.Alias()] = link
|
|
||||||
if err := link.Enable(); err != nil {
|
|
||||||
rollback()
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, envVar := range link.ToEnv() {
|
|
||||||
env = append(env, envVar)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return env, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) createDaemonEnvironment(linkedEnv []string) []string {
|
|
||||||
// if a domain name was specified, append it to the hostname (see #7851)
|
|
||||||
fullHostname := container.Config.Hostname
|
|
||||||
if container.Config.Domainname != "" {
|
|
||||||
fullHostname = fmt.Sprintf("%s.%s", fullHostname, container.Config.Domainname)
|
|
||||||
}
|
|
||||||
// Setup environment
|
|
||||||
env := []string{
|
|
||||||
"PATH=" + DefaultPathEnv,
|
|
||||||
"HOSTNAME=" + fullHostname,
|
|
||||||
// Note: we don't set HOME here because it'll get autoset intelligently
|
|
||||||
// based on the value of USER inside dockerinit, but only if it isn't
|
|
||||||
// set already (ie, that can be overridden by setting HOME via -e or ENV
|
|
||||||
// in a Dockerfile).
|
|
||||||
}
|
|
||||||
if container.Config.Tty {
|
|
||||||
env = append(env, "TERM=xterm")
|
|
||||||
}
|
|
||||||
env = append(env, linkedEnv...)
|
|
||||||
// because the env on the container can override certain default values
|
|
||||||
// we need to replace the 'env' keys where they match and append anything
|
|
||||||
// else.
|
|
||||||
env = utils.ReplaceOrAppendEnvValues(env, container.Config.Env)
|
|
||||||
|
|
||||||
return env
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) setupWorkingDirectory() error {
|
|
||||||
if container.Config.WorkingDir != "" {
|
|
||||||
container.Config.WorkingDir = path.Clean(container.Config.WorkingDir)
|
|
||||||
|
|
||||||
pth, err := container.GetResourcePath(container.Config.WorkingDir)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
pthInfo, err := os.Stat(pth)
|
|
||||||
if err != nil {
|
|
||||||
if !os.IsNotExist(err) {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := os.MkdirAll(pth, 0755); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if pthInfo != nil && !pthInfo.IsDir() {
|
|
||||||
return fmt.Errorf("Cannot mkdir: %s is not a directory", container.Config.WorkingDir)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) getLogConfig() runconfig.LogConfig {
|
func (container *Container) getLogConfig() runconfig.LogConfig {
|
||||||
cfg := container.hostConfig.LogConfig
|
cfg := container.hostConfig.LogConfig
|
||||||
if cfg.Type != "" { // container has log driver configured
|
if cfg.Type != "" { // container has log driver configured
|
||||||
|
@ -1508,23 +715,6 @@ func (container *Container) waitForStart() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (container *Container) allocatePort(port nat.Port, bindings nat.PortMap) error {
|
|
||||||
binding := bindings[port]
|
|
||||||
if container.hostConfig.PublishAllPorts && len(binding) == 0 {
|
|
||||||
binding = append(binding, nat.PortBinding{})
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := 0; i < len(binding); i++ {
|
|
||||||
b, err := bridge.AllocatePort(container.ID, port, binding[i])
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
binding[i] = b
|
|
||||||
}
|
|
||||||
bindings[port] = binding
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) GetProcessLabel() string {
|
func (container *Container) GetProcessLabel() string {
|
||||||
// even if we have a process label return "" if we are running
|
// even if we have a process label return "" if we are running
|
||||||
// in privileged mode
|
// in privileged mode
|
||||||
|
@ -1541,41 +731,6 @@ func (container *Container) GetMountLabel() string {
|
||||||
return container.MountLabel
|
return container.MountLabel
|
||||||
}
|
}
|
||||||
|
|
||||||
func (container *Container) getIpcContainer() (*Container, error) {
|
|
||||||
containerID := container.hostConfig.IpcMode.Container()
|
|
||||||
c, err := container.daemon.Get(containerID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if !c.IsRunning() {
|
|
||||||
return nil, fmt.Errorf("cannot join IPC of a non running container: %s", containerID)
|
|
||||||
}
|
|
||||||
return c, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) getNetworkedContainer() (*Container, error) {
|
|
||||||
parts := strings.SplitN(string(container.hostConfig.NetworkMode), ":", 2)
|
|
||||||
switch parts[0] {
|
|
||||||
case "container":
|
|
||||||
if len(parts) != 2 {
|
|
||||||
return nil, fmt.Errorf("no container specified to join network")
|
|
||||||
}
|
|
||||||
nc, err := container.daemon.Get(parts[1])
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if container == nc {
|
|
||||||
return nil, fmt.Errorf("cannot join own network")
|
|
||||||
}
|
|
||||||
if !nc.IsRunning() {
|
|
||||||
return nil, fmt.Errorf("cannot join network of a non running container: %s", parts[1])
|
|
||||||
}
|
|
||||||
return nc, nil
|
|
||||||
default:
|
|
||||||
return nil, fmt.Errorf("network mode not set to container")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) Stats() (*execdriver.ResourceStats, error) {
|
func (container *Container) Stats() (*execdriver.ResourceStats, error) {
|
||||||
return container.daemon.Stats(container)
|
return container.daemon.Stats(container)
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,885 @@
|
||||||
|
// +build linux
|
||||||
|
|
||||||
|
package daemon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"syscall"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/Sirupsen/logrus"
|
||||||
|
"github.com/docker/docker/daemon/execdriver"
|
||||||
|
"github.com/docker/docker/daemon/network"
|
||||||
|
"github.com/docker/docker/daemon/networkdriver/bridge"
|
||||||
|
"github.com/docker/docker/links"
|
||||||
|
"github.com/docker/docker/nat"
|
||||||
|
"github.com/docker/docker/pkg/archive"
|
||||||
|
"github.com/docker/docker/pkg/directory"
|
||||||
|
"github.com/docker/docker/pkg/etchosts"
|
||||||
|
"github.com/docker/docker/pkg/ioutils"
|
||||||
|
"github.com/docker/docker/pkg/resolvconf"
|
||||||
|
"github.com/docker/docker/pkg/stringid"
|
||||||
|
"github.com/docker/docker/pkg/ulimit"
|
||||||
|
"github.com/docker/docker/runconfig"
|
||||||
|
"github.com/docker/docker/utils"
|
||||||
|
"github.com/docker/libcontainer/configs"
|
||||||
|
"github.com/docker/libcontainer/devices"
|
||||||
|
)
|
||||||
|
|
||||||
|
const DefaultPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||||
|
|
||||||
|
type Container struct {
|
||||||
|
CommonContainer
|
||||||
|
|
||||||
|
// Fields below here are platform specific.
|
||||||
|
|
||||||
|
AppArmorProfile string
|
||||||
|
|
||||||
|
// Store rw/ro in a separate structure to preserve reverse-compatibility on-disk.
|
||||||
|
// Easier than migrating older container configs :)
|
||||||
|
VolumesRW map[string]bool
|
||||||
|
|
||||||
|
AppliedVolumesFrom map[string]struct{}
|
||||||
|
|
||||||
|
activeLinks map[string]*links.Link
|
||||||
|
}
|
||||||
|
|
||||||
|
func killProcessDirectly(container *Container) error {
|
||||||
|
if _, err := container.WaitStop(10 * time.Second); err != nil {
|
||||||
|
// Ensure that we don't kill ourselves
|
||||||
|
if pid := container.GetPid(); pid != 0 {
|
||||||
|
logrus.Infof("Container %s failed to exit within 10 seconds of kill - trying direct SIGKILL", stringid.TruncateID(container.ID))
|
||||||
|
if err := syscall.Kill(pid, 9); err != nil {
|
||||||
|
if err != syscall.ESRCH {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
logrus.Debugf("Cannot kill process (pid=%d) with signal 9: no such process.", pid)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) setupContainerDns() error {
|
||||||
|
if container.ResolvConfPath != "" {
|
||||||
|
// check if this is an existing container that needs DNS update:
|
||||||
|
if container.UpdateDns {
|
||||||
|
// read the host's resolv.conf, get the hash and call updateResolvConf
|
||||||
|
logrus.Debugf("Check container (%s) for update to resolv.conf - UpdateDns flag was set", container.ID)
|
||||||
|
latestResolvConf, latestHash := resolvconf.GetLastModified()
|
||||||
|
|
||||||
|
// clean container resolv.conf re: localhost nameservers and IPv6 NS (if IPv6 disabled)
|
||||||
|
updatedResolvConf, modified := resolvconf.FilterResolvDns(latestResolvConf, container.daemon.config.Bridge.EnableIPv6)
|
||||||
|
if modified {
|
||||||
|
// changes have occurred during resolv.conf localhost cleanup: generate an updated hash
|
||||||
|
newHash, err := ioutils.HashData(bytes.NewReader(updatedResolvConf))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
latestHash = newHash
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := container.updateResolvConf(updatedResolvConf, latestHash); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// successful update of the restarting container; set the flag off
|
||||||
|
container.UpdateDns = false
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
config = container.hostConfig
|
||||||
|
daemon = container.daemon
|
||||||
|
)
|
||||||
|
|
||||||
|
resolvConf, err := resolvconf.Get()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
container.ResolvConfPath, err = container.GetRootResourcePath("resolv.conf")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if config.NetworkMode.IsBridge() || config.NetworkMode.IsNone() {
|
||||||
|
// check configurations for any container/daemon dns settings
|
||||||
|
if len(config.Dns) > 0 || len(daemon.config.Dns) > 0 || len(config.DnsSearch) > 0 || len(daemon.config.DnsSearch) > 0 {
|
||||||
|
var (
|
||||||
|
dns = resolvconf.GetNameservers(resolvConf)
|
||||||
|
dnsSearch = resolvconf.GetSearchDomains(resolvConf)
|
||||||
|
)
|
||||||
|
if len(config.Dns) > 0 {
|
||||||
|
dns = config.Dns
|
||||||
|
} else if len(daemon.config.Dns) > 0 {
|
||||||
|
dns = daemon.config.Dns
|
||||||
|
}
|
||||||
|
if len(config.DnsSearch) > 0 {
|
||||||
|
dnsSearch = config.DnsSearch
|
||||||
|
} else if len(daemon.config.DnsSearch) > 0 {
|
||||||
|
dnsSearch = daemon.config.DnsSearch
|
||||||
|
}
|
||||||
|
return resolvconf.Build(container.ResolvConfPath, dns, dnsSearch)
|
||||||
|
}
|
||||||
|
|
||||||
|
// replace any localhost/127.*, and remove IPv6 nameservers if IPv6 disabled in daemon
|
||||||
|
resolvConf, _ = resolvconf.FilterResolvDns(resolvConf, daemon.config.Bridge.EnableIPv6)
|
||||||
|
}
|
||||||
|
//get a sha256 hash of the resolv conf at this point so we can check
|
||||||
|
//for changes when the host resolv.conf changes (e.g. network update)
|
||||||
|
resolvHash, err := ioutils.HashData(bytes.NewReader(resolvConf))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
resolvHashFile := container.ResolvConfPath + ".hash"
|
||||||
|
if err = ioutil.WriteFile(resolvHashFile, []byte(resolvHash), 0644); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return ioutil.WriteFile(container.ResolvConfPath, resolvConf, 0644)
|
||||||
|
}
|
||||||
|
|
||||||
|
// called when the host's resolv.conf changes to check whether container's resolv.conf
|
||||||
|
// is unchanged by the container "user" since container start: if unchanged, the
|
||||||
|
// container's resolv.conf will be updated to match the host's new resolv.conf
|
||||||
|
func (container *Container) updateResolvConf(updatedResolvConf []byte, newResolvHash string) error {
|
||||||
|
|
||||||
|
if container.ResolvConfPath == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if container.Running {
|
||||||
|
//set a marker in the hostConfig to update on next start/restart
|
||||||
|
container.UpdateDns = true
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
resolvHashFile := container.ResolvConfPath + ".hash"
|
||||||
|
|
||||||
|
//read the container's current resolv.conf and compute the hash
|
||||||
|
resolvBytes, err := ioutil.ReadFile(container.ResolvConfPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
curHash, err := ioutils.HashData(bytes.NewReader(resolvBytes))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
//read the hash from the last time we wrote resolv.conf in the container
|
||||||
|
hashBytes, err := ioutil.ReadFile(resolvHashFile)
|
||||||
|
if err != nil {
|
||||||
|
if !os.IsNotExist(err) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// backwards compat: if no hash file exists, this container pre-existed from
|
||||||
|
// a Docker daemon that didn't contain this update feature. Given we can't know
|
||||||
|
// if the user has modified the resolv.conf since container start time, safer
|
||||||
|
// to just never update the container's resolv.conf during it's lifetime which
|
||||||
|
// we can control by setting hashBytes to an empty string
|
||||||
|
hashBytes = []byte("")
|
||||||
|
}
|
||||||
|
|
||||||
|
//if the user has not modified the resolv.conf of the container since we wrote it last
|
||||||
|
//we will replace it with the updated resolv.conf from the host
|
||||||
|
if string(hashBytes) == curHash {
|
||||||
|
logrus.Debugf("replacing %q with updated host resolv.conf", container.ResolvConfPath)
|
||||||
|
|
||||||
|
// for atomic updates to these files, use temporary files with os.Rename:
|
||||||
|
dir := filepath.Dir(container.ResolvConfPath)
|
||||||
|
tmpHashFile, err := ioutil.TempFile(dir, "hash")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
tmpResolvFile, err := ioutil.TempFile(dir, "resolv")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// write the updates to the temp files
|
||||||
|
if err = ioutil.WriteFile(tmpHashFile.Name(), []byte(newResolvHash), 0644); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err = ioutil.WriteFile(tmpResolvFile.Name(), updatedResolvConf, 0644); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// rename the temp files for atomic replace
|
||||||
|
if err = os.Rename(tmpHashFile.Name(), resolvHashFile); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return os.Rename(tmpResolvFile.Name(), container.ResolvConfPath)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) updateParentsHosts() error {
|
||||||
|
refs := container.daemon.ContainerGraph().RefPaths(container.ID)
|
||||||
|
for _, ref := range refs {
|
||||||
|
if ref.ParentID == "0" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
c, err := container.daemon.Get(ref.ParentID)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Error(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if c != nil && !container.daemon.config.DisableNetwork && container.hostConfig.NetworkMode.IsPrivate() {
|
||||||
|
logrus.Debugf("Update /etc/hosts of %s for alias %s with ip %s", c.ID, ref.Name, container.NetworkSettings.IPAddress)
|
||||||
|
if err := etchosts.Update(c.HostsPath, container.NetworkSettings.IPAddress, ref.Name); err != nil {
|
||||||
|
logrus.Errorf("Failed to update /etc/hosts in parent container %s for alias %s: %v", c.ID, ref.Name, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) setupLinkedContainers() ([]string, error) {
|
||||||
|
var (
|
||||||
|
env []string
|
||||||
|
daemon = container.daemon
|
||||||
|
)
|
||||||
|
children, err := daemon.Children(container.Name)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(children) > 0 {
|
||||||
|
container.activeLinks = make(map[string]*links.Link, len(children))
|
||||||
|
|
||||||
|
// If we encounter an error make sure that we rollback any network
|
||||||
|
// config and iptables changes
|
||||||
|
rollback := func() {
|
||||||
|
for _, link := range container.activeLinks {
|
||||||
|
link.Disable()
|
||||||
|
}
|
||||||
|
container.activeLinks = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
for linkAlias, child := range children {
|
||||||
|
if !child.IsRunning() {
|
||||||
|
return nil, fmt.Errorf("Cannot link to a non running container: %s AS %s", child.Name, linkAlias)
|
||||||
|
}
|
||||||
|
|
||||||
|
link, err := links.NewLink(
|
||||||
|
container.NetworkSettings.IPAddress,
|
||||||
|
child.NetworkSettings.IPAddress,
|
||||||
|
linkAlias,
|
||||||
|
child.Config.Env,
|
||||||
|
child.Config.ExposedPorts,
|
||||||
|
)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
rollback()
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
container.activeLinks[link.Alias()] = link
|
||||||
|
if err := link.Enable(); err != nil {
|
||||||
|
rollback()
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, envVar := range link.ToEnv() {
|
||||||
|
env = append(env, envVar)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return env, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) createDaemonEnvironment(linkedEnv []string) []string {
|
||||||
|
// if a domain name was specified, append it to the hostname (see #7851)
|
||||||
|
fullHostname := container.Config.Hostname
|
||||||
|
if container.Config.Domainname != "" {
|
||||||
|
fullHostname = fmt.Sprintf("%s.%s", fullHostname, container.Config.Domainname)
|
||||||
|
}
|
||||||
|
// Setup environment
|
||||||
|
env := []string{
|
||||||
|
"PATH=" + DefaultPathEnv,
|
||||||
|
"HOSTNAME=" + fullHostname,
|
||||||
|
// Note: we don't set HOME here because it'll get autoset intelligently
|
||||||
|
// based on the value of USER inside dockerinit, but only if it isn't
|
||||||
|
// set already (ie, that can be overridden by setting HOME via -e or ENV
|
||||||
|
// in a Dockerfile).
|
||||||
|
}
|
||||||
|
if container.Config.Tty {
|
||||||
|
env = append(env, "TERM=xterm")
|
||||||
|
}
|
||||||
|
env = append(env, linkedEnv...)
|
||||||
|
// because the env on the container can override certain default values
|
||||||
|
// we need to replace the 'env' keys where they match and append anything
|
||||||
|
// else.
|
||||||
|
env = utils.ReplaceOrAppendEnvValues(env, container.Config.Env)
|
||||||
|
|
||||||
|
return env
|
||||||
|
}
|
||||||
|
|
||||||
|
func getDevicesFromPath(deviceMapping runconfig.DeviceMapping) (devs []*configs.Device, err error) {
|
||||||
|
device, err := devices.DeviceFromPath(deviceMapping.PathOnHost, deviceMapping.CgroupPermissions)
|
||||||
|
// if there was no error, return the device
|
||||||
|
if err == nil {
|
||||||
|
device.Path = deviceMapping.PathInContainer
|
||||||
|
return append(devs, device), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// if the device is not a device node
|
||||||
|
// try to see if it's a directory holding many devices
|
||||||
|
if err == devices.ErrNotADevice {
|
||||||
|
|
||||||
|
// check if it is a directory
|
||||||
|
if src, e := os.Stat(deviceMapping.PathOnHost); e == nil && src.IsDir() {
|
||||||
|
|
||||||
|
// mount the internal devices recursively
|
||||||
|
filepath.Walk(deviceMapping.PathOnHost, func(dpath string, f os.FileInfo, e error) error {
|
||||||
|
childDevice, e := devices.DeviceFromPath(dpath, deviceMapping.CgroupPermissions)
|
||||||
|
if e != nil {
|
||||||
|
// ignore the device
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// add the device to userSpecified devices
|
||||||
|
childDevice.Path = strings.Replace(dpath, deviceMapping.PathOnHost, deviceMapping.PathInContainer, 1)
|
||||||
|
devs = append(devs, childDevice)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(devs) > 0 {
|
||||||
|
return devs, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return devs, fmt.Errorf("error gathering device information while adding custom device %q: %s", deviceMapping.PathOnHost, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func populateCommand(c *Container, env []string) error {
|
||||||
|
en := &execdriver.Network{
|
||||||
|
Mtu: c.daemon.config.Mtu,
|
||||||
|
Interface: nil,
|
||||||
|
}
|
||||||
|
|
||||||
|
parts := strings.SplitN(string(c.hostConfig.NetworkMode), ":", 2)
|
||||||
|
switch parts[0] {
|
||||||
|
case "none":
|
||||||
|
case "host":
|
||||||
|
en.HostNetworking = true
|
||||||
|
case "bridge", "": // empty string to support existing containers
|
||||||
|
if !c.Config.NetworkDisabled {
|
||||||
|
network := c.NetworkSettings
|
||||||
|
en.Interface = &execdriver.NetworkInterface{
|
||||||
|
Gateway: network.Gateway,
|
||||||
|
Bridge: network.Bridge,
|
||||||
|
IPAddress: network.IPAddress,
|
||||||
|
IPPrefixLen: network.IPPrefixLen,
|
||||||
|
MacAddress: network.MacAddress,
|
||||||
|
LinkLocalIPv6Address: network.LinkLocalIPv6Address,
|
||||||
|
GlobalIPv6Address: network.GlobalIPv6Address,
|
||||||
|
GlobalIPv6PrefixLen: network.GlobalIPv6PrefixLen,
|
||||||
|
IPv6Gateway: network.IPv6Gateway,
|
||||||
|
HairpinMode: network.HairpinMode,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case "container":
|
||||||
|
nc, err := c.getNetworkedContainer()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
en.ContainerID = nc.ID
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("invalid network mode: %s", c.hostConfig.NetworkMode)
|
||||||
|
}
|
||||||
|
|
||||||
|
ipc := &execdriver.Ipc{}
|
||||||
|
|
||||||
|
if c.hostConfig.IpcMode.IsContainer() {
|
||||||
|
ic, err := c.getIpcContainer()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
ipc.ContainerID = ic.ID
|
||||||
|
} else {
|
||||||
|
ipc.HostIpc = c.hostConfig.IpcMode.IsHost()
|
||||||
|
}
|
||||||
|
|
||||||
|
pid := &execdriver.Pid{}
|
||||||
|
pid.HostPid = c.hostConfig.PidMode.IsHost()
|
||||||
|
|
||||||
|
uts := &execdriver.UTS{
|
||||||
|
HostUTS: c.hostConfig.UTSMode.IsHost(),
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build lists of devices allowed and created within the container.
|
||||||
|
var userSpecifiedDevices []*configs.Device
|
||||||
|
for _, deviceMapping := range c.hostConfig.Devices {
|
||||||
|
devs, err := getDevicesFromPath(deviceMapping)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
userSpecifiedDevices = append(userSpecifiedDevices, devs...)
|
||||||
|
}
|
||||||
|
allowedDevices := append(configs.DefaultAllowedDevices, userSpecifiedDevices...)
|
||||||
|
|
||||||
|
autoCreatedDevices := append(configs.DefaultAutoCreatedDevices, userSpecifiedDevices...)
|
||||||
|
|
||||||
|
// TODO: this can be removed after lxc-conf is fully deprecated
|
||||||
|
lxcConfig, err := mergeLxcConfIntoOptions(c.hostConfig)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
var rlimits []*ulimit.Rlimit
|
||||||
|
ulimits := c.hostConfig.Ulimits
|
||||||
|
|
||||||
|
// Merge ulimits with daemon defaults
|
||||||
|
ulIdx := make(map[string]*ulimit.Ulimit)
|
||||||
|
for _, ul := range ulimits {
|
||||||
|
ulIdx[ul.Name] = ul
|
||||||
|
}
|
||||||
|
for name, ul := range c.daemon.config.Ulimits {
|
||||||
|
if _, exists := ulIdx[name]; !exists {
|
||||||
|
ulimits = append(ulimits, ul)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, limit := range ulimits {
|
||||||
|
rl, err := limit.GetRlimit()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
rlimits = append(rlimits, rl)
|
||||||
|
}
|
||||||
|
|
||||||
|
resources := &execdriver.Resources{
|
||||||
|
Memory: c.hostConfig.Memory,
|
||||||
|
MemorySwap: c.hostConfig.MemorySwap,
|
||||||
|
CpuShares: c.hostConfig.CpuShares,
|
||||||
|
CpusetCpus: c.hostConfig.CpusetCpus,
|
||||||
|
CpusetMems: c.hostConfig.CpusetMems,
|
||||||
|
CpuPeriod: c.hostConfig.CpuPeriod,
|
||||||
|
CpuQuota: c.hostConfig.CpuQuota,
|
||||||
|
BlkioWeight: c.hostConfig.BlkioWeight,
|
||||||
|
Rlimits: rlimits,
|
||||||
|
OomKillDisable: c.hostConfig.OomKillDisable,
|
||||||
|
}
|
||||||
|
|
||||||
|
processConfig := execdriver.ProcessConfig{
|
||||||
|
Privileged: c.hostConfig.Privileged,
|
||||||
|
Entrypoint: c.Path,
|
||||||
|
Arguments: c.Args,
|
||||||
|
Tty: c.Config.Tty,
|
||||||
|
User: c.Config.User,
|
||||||
|
}
|
||||||
|
|
||||||
|
processConfig.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
|
||||||
|
processConfig.Env = env
|
||||||
|
|
||||||
|
c.command = &execdriver.Command{
|
||||||
|
ID: c.ID,
|
||||||
|
Rootfs: c.RootfsPath(),
|
||||||
|
ReadonlyRootfs: c.hostConfig.ReadonlyRootfs,
|
||||||
|
InitPath: "/.dockerinit",
|
||||||
|
WorkingDir: c.Config.WorkingDir,
|
||||||
|
Network: en,
|
||||||
|
Ipc: ipc,
|
||||||
|
Pid: pid,
|
||||||
|
UTS: uts,
|
||||||
|
Resources: resources,
|
||||||
|
AllowedDevices: allowedDevices,
|
||||||
|
AutoCreatedDevices: autoCreatedDevices,
|
||||||
|
CapAdd: c.hostConfig.CapAdd,
|
||||||
|
CapDrop: c.hostConfig.CapDrop,
|
||||||
|
ProcessConfig: processConfig,
|
||||||
|
ProcessLabel: c.GetProcessLabel(),
|
||||||
|
MountLabel: c.GetMountLabel(),
|
||||||
|
LxcConfig: lxcConfig,
|
||||||
|
AppArmorProfile: c.AppArmorProfile,
|
||||||
|
CgroupParent: c.hostConfig.CgroupParent,
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSize, return real size, virtual size
|
||||||
|
func (container *Container) GetSize() (int64, int64) {
|
||||||
|
var (
|
||||||
|
sizeRw, sizeRootfs int64
|
||||||
|
err error
|
||||||
|
driver = container.daemon.driver
|
||||||
|
)
|
||||||
|
|
||||||
|
if err := container.Mount(); err != nil {
|
||||||
|
logrus.Errorf("Failed to compute size of container rootfs %s: %s", container.ID, err)
|
||||||
|
return sizeRw, sizeRootfs
|
||||||
|
}
|
||||||
|
defer container.Unmount()
|
||||||
|
|
||||||
|
initID := fmt.Sprintf("%s-init", container.ID)
|
||||||
|
sizeRw, err = driver.DiffSize(container.ID, initID)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Errorf("Driver %s couldn't return diff size of container %s: %s", driver, container.ID, err)
|
||||||
|
// FIXME: GetSize should return an error. Not changing it now in case
|
||||||
|
// there is a side-effect.
|
||||||
|
sizeRw = -1
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err = os.Stat(container.basefs); err != nil {
|
||||||
|
if sizeRootfs, err = directory.Size(container.basefs); err != nil {
|
||||||
|
sizeRootfs = -1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sizeRw, sizeRootfs
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) AllocateNetwork() error {
|
||||||
|
mode := container.hostConfig.NetworkMode
|
||||||
|
if container.Config.NetworkDisabled || !mode.IsPrivate() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var err error
|
||||||
|
|
||||||
|
networkSettings, err := bridge.Allocate(container.ID, container.Config.MacAddress, "", "")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Error handling: At this point, the interface is allocated so we have to
|
||||||
|
// make sure that it is always released in case of error, otherwise we
|
||||||
|
// might leak resources.
|
||||||
|
|
||||||
|
if container.Config.PortSpecs != nil {
|
||||||
|
if err = migratePortMappings(container.Config, container.hostConfig); err != nil {
|
||||||
|
bridge.Release(container.ID)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
container.Config.PortSpecs = nil
|
||||||
|
if err = container.WriteHostConfig(); err != nil {
|
||||||
|
bridge.Release(container.ID)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
portSpecs = make(nat.PortSet)
|
||||||
|
bindings = make(nat.PortMap)
|
||||||
|
)
|
||||||
|
|
||||||
|
if container.Config.ExposedPorts != nil {
|
||||||
|
portSpecs = container.Config.ExposedPorts
|
||||||
|
}
|
||||||
|
|
||||||
|
if container.hostConfig.PortBindings != nil {
|
||||||
|
for p, b := range container.hostConfig.PortBindings {
|
||||||
|
bindings[p] = []nat.PortBinding{}
|
||||||
|
for _, bb := range b {
|
||||||
|
bindings[p] = append(bindings[p], nat.PortBinding{
|
||||||
|
HostIp: bb.HostIp,
|
||||||
|
HostPort: bb.HostPort,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
container.NetworkSettings.PortMapping = nil
|
||||||
|
|
||||||
|
ports := make([]nat.Port, len(portSpecs))
|
||||||
|
var i int
|
||||||
|
for p := range portSpecs {
|
||||||
|
ports[i] = p
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
nat.SortPortMap(ports, bindings)
|
||||||
|
for _, port := range ports {
|
||||||
|
if err = container.allocatePort(port, bindings); err != nil {
|
||||||
|
bridge.Release(container.ID)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
container.WriteHostConfig()
|
||||||
|
|
||||||
|
networkSettings.Ports = bindings
|
||||||
|
container.NetworkSettings = networkSettings
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) initializeNetworking() error {
|
||||||
|
var err error
|
||||||
|
if container.hostConfig.NetworkMode.IsHost() {
|
||||||
|
container.Config.Hostname, err = os.Hostname()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
parts := strings.SplitN(container.Config.Hostname, ".", 2)
|
||||||
|
if len(parts) > 1 {
|
||||||
|
container.Config.Hostname = parts[0]
|
||||||
|
container.Config.Domainname = parts[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
content, err := ioutil.ReadFile("/etc/hosts")
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return container.buildHostnameAndHostsFiles("")
|
||||||
|
} else if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := container.buildHostnameFile(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
hostsPath, err := container.GetRootResourcePath("hosts")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
container.HostsPath = hostsPath
|
||||||
|
|
||||||
|
return ioutil.WriteFile(container.HostsPath, content, 0644)
|
||||||
|
}
|
||||||
|
if container.hostConfig.NetworkMode.IsContainer() {
|
||||||
|
// we need to get the hosts files from the container to join
|
||||||
|
nc, err := container.getNetworkedContainer()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
container.HostnamePath = nc.HostnamePath
|
||||||
|
container.HostsPath = nc.HostsPath
|
||||||
|
container.ResolvConfPath = nc.ResolvConfPath
|
||||||
|
container.Config.Hostname = nc.Config.Hostname
|
||||||
|
container.Config.Domainname = nc.Config.Domainname
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if container.daemon.config.DisableNetwork {
|
||||||
|
container.Config.NetworkDisabled = true
|
||||||
|
return container.buildHostnameAndHostsFiles("127.0.1.1")
|
||||||
|
}
|
||||||
|
if err := container.AllocateNetwork(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return container.buildHostnameAndHostsFiles(container.NetworkSettings.IPAddress)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make sure the config is compatible with the current kernel
|
||||||
|
func (container *Container) verifyDaemonSettings() {
|
||||||
|
if container.hostConfig.Memory > 0 && !container.daemon.sysInfo.MemoryLimit {
|
||||||
|
logrus.Warnf("Your kernel does not support memory limit capabilities. Limitation discarded.")
|
||||||
|
container.hostConfig.Memory = 0
|
||||||
|
}
|
||||||
|
if container.hostConfig.Memory > 0 && container.hostConfig.MemorySwap != -1 && !container.daemon.sysInfo.SwapLimit {
|
||||||
|
logrus.Warnf("Your kernel does not support swap limit capabilities. Limitation discarded.")
|
||||||
|
container.hostConfig.MemorySwap = -1
|
||||||
|
}
|
||||||
|
if container.daemon.sysInfo.IPv4ForwardingDisabled {
|
||||||
|
logrus.Warnf("IPv4 forwarding is disabled. Networking will not work")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) ExportRw() (archive.Archive, error) {
|
||||||
|
if err := container.Mount(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if container.daemon == nil {
|
||||||
|
return nil, fmt.Errorf("Can't load storage driver for unregistered container %s", container.ID)
|
||||||
|
}
|
||||||
|
archive, err := container.daemon.Diff(container)
|
||||||
|
if err != nil {
|
||||||
|
container.Unmount()
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return ioutils.NewReadCloserWrapper(archive, func() error {
|
||||||
|
err := archive.Close()
|
||||||
|
container.Unmount()
|
||||||
|
return err
|
||||||
|
}),
|
||||||
|
nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) buildHostnameFile() error {
|
||||||
|
hostnamePath, err := container.GetRootResourcePath("hostname")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
container.HostnamePath = hostnamePath
|
||||||
|
|
||||||
|
if container.Config.Domainname != "" {
|
||||||
|
return ioutil.WriteFile(container.HostnamePath, []byte(fmt.Sprintf("%s.%s\n", container.Config.Hostname, container.Config.Domainname)), 0644)
|
||||||
|
}
|
||||||
|
return ioutil.WriteFile(container.HostnamePath, []byte(container.Config.Hostname+"\n"), 0644)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) buildHostsFiles(IP string) error {
|
||||||
|
|
||||||
|
hostsPath, err := container.GetRootResourcePath("hosts")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
container.HostsPath = hostsPath
|
||||||
|
|
||||||
|
var extraContent []etchosts.Record
|
||||||
|
|
||||||
|
children, err := container.daemon.Children(container.Name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
for linkAlias, child := range children {
|
||||||
|
_, alias := filepath.Split(linkAlias)
|
||||||
|
// allow access to the linked container via the alias, real name, and container hostname
|
||||||
|
aliasList := alias + " " + child.Config.Hostname
|
||||||
|
// only add the name if alias isn't equal to the name
|
||||||
|
if alias != child.Name[1:] {
|
||||||
|
aliasList = aliasList + " " + child.Name[1:]
|
||||||
|
}
|
||||||
|
extraContent = append(extraContent, etchosts.Record{Hosts: aliasList, IP: child.NetworkSettings.IPAddress})
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, extraHost := range container.hostConfig.ExtraHosts {
|
||||||
|
// allow IPv6 addresses in extra hosts; only split on first ":"
|
||||||
|
parts := strings.SplitN(extraHost, ":", 2)
|
||||||
|
extraContent = append(extraContent, etchosts.Record{Hosts: parts[0], IP: parts[1]})
|
||||||
|
}
|
||||||
|
|
||||||
|
return etchosts.Build(container.HostsPath, IP, container.Config.Hostname, container.Config.Domainname, extraContent)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) buildHostnameAndHostsFiles(IP string) error {
|
||||||
|
if err := container.buildHostnameFile(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return container.buildHostsFiles(IP)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) getIpcContainer() (*Container, error) {
|
||||||
|
containerID := container.hostConfig.IpcMode.Container()
|
||||||
|
c, err := container.daemon.Get(containerID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if !c.IsRunning() {
|
||||||
|
return nil, fmt.Errorf("cannot join IPC of a non running container: %s", containerID)
|
||||||
|
}
|
||||||
|
return c, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) setupWorkingDirectory() error {
|
||||||
|
if container.Config.WorkingDir != "" {
|
||||||
|
container.Config.WorkingDir = filepath.Clean(container.Config.WorkingDir)
|
||||||
|
|
||||||
|
pth, err := container.GetResourcePath(container.Config.WorkingDir)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
pthInfo, err := os.Stat(pth)
|
||||||
|
if err != nil {
|
||||||
|
if !os.IsNotExist(err) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := os.MkdirAll(pth, 0755); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if pthInfo != nil && !pthInfo.IsDir() {
|
||||||
|
return fmt.Errorf("Cannot mkdir: %s is not a directory", container.Config.WorkingDir)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) allocatePort(port nat.Port, bindings nat.PortMap) error {
|
||||||
|
binding := bindings[port]
|
||||||
|
if container.hostConfig.PublishAllPorts && len(binding) == 0 {
|
||||||
|
binding = append(binding, nat.PortBinding{})
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := 0; i < len(binding); i++ {
|
||||||
|
b, err := bridge.AllocatePort(container.ID, port, binding[i])
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
binding[i] = b
|
||||||
|
}
|
||||||
|
bindings[port] = binding
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) getNetworkedContainer() (*Container, error) {
|
||||||
|
parts := strings.SplitN(string(container.hostConfig.NetworkMode), ":", 2)
|
||||||
|
switch parts[0] {
|
||||||
|
case "container":
|
||||||
|
if len(parts) != 2 {
|
||||||
|
return nil, fmt.Errorf("no container specified to join network")
|
||||||
|
}
|
||||||
|
nc, err := container.daemon.Get(parts[1])
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if container == nc {
|
||||||
|
return nil, fmt.Errorf("cannot join own network")
|
||||||
|
}
|
||||||
|
if !nc.IsRunning() {
|
||||||
|
return nil, fmt.Errorf("cannot join network of a non running container: %s", parts[1])
|
||||||
|
}
|
||||||
|
return nc, nil
|
||||||
|
default:
|
||||||
|
return nil, fmt.Errorf("network mode not set to container")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) ReleaseNetwork() {
|
||||||
|
if container.Config.NetworkDisabled || !container.hostConfig.NetworkMode.IsPrivate() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
bridge.Release(container.ID)
|
||||||
|
container.NetworkSettings = &network.Settings{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) RestoreNetwork() error {
|
||||||
|
mode := container.hostConfig.NetworkMode
|
||||||
|
// Don't attempt a restore if we previously didn't allocate networking.
|
||||||
|
// This might be a legacy container with no network allocated, in which case the
|
||||||
|
// allocation will happen once and for all at start.
|
||||||
|
if !container.isNetworkAllocated() || container.Config.NetworkDisabled || !mode.IsPrivate() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Re-allocate the interface with the same IP and MAC address.
|
||||||
|
if _, err := bridge.Allocate(container.ID, container.NetworkSettings.MacAddress, container.NetworkSettings.IPAddress, ""); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Re-allocate any previously allocated ports.
|
||||||
|
for port := range container.NetworkSettings.Ports {
|
||||||
|
if err := container.allocatePort(port, container.NetworkSettings.Ports); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func disableAllActiveLinks(container *Container) {
|
||||||
|
if container.activeLinks != nil {
|
||||||
|
for _, link := range container.activeLinks {
|
||||||
|
link.Disable()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) DisableLink(name string) {
|
||||||
|
if container.activeLinks != nil {
|
||||||
|
if link, exists := container.activeLinks[name]; exists {
|
||||||
|
link.Disable()
|
||||||
|
} else {
|
||||||
|
logrus.Debugf("Could not find active link for %s", name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,173 @@
|
||||||
|
// +build windows
|
||||||
|
|
||||||
|
package daemon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/docker/docker/daemon/execdriver"
|
||||||
|
"github.com/docker/docker/pkg/archive"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TODO Windows. A reasonable default at the moment.
|
||||||
|
const DefaultPathEnv = `c:\windows\system32;c:\windows\system32\WindowsPowerShell\v1.0`
|
||||||
|
|
||||||
|
type Container struct {
|
||||||
|
CommonContainer
|
||||||
|
|
||||||
|
// Fields below here are platform specific.
|
||||||
|
|
||||||
|
// TODO Windows. Further factoring out of unused fields will be necessary.
|
||||||
|
|
||||||
|
// ---- START OF TEMPORARY DECLARATION ----
|
||||||
|
// TODO Windows. Temporarily keeping fields in to assist in compilation
|
||||||
|
// of the daemon on Windows without affecting many other files in a single
|
||||||
|
// PR, thus making code review significantly harder. These lines will be
|
||||||
|
// removed in subsequent PRs.
|
||||||
|
|
||||||
|
AppArmorProfile string
|
||||||
|
|
||||||
|
// Store rw/ro in a separate structure to preserve reverse-compatibility on-disk.
|
||||||
|
// Easier than migrating older container configs :)
|
||||||
|
VolumesRW map[string]bool
|
||||||
|
|
||||||
|
AppliedVolumesFrom map[string]struct{}
|
||||||
|
// ---- END OF TEMPORARY DECLARATION ----
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
func killProcessDirectly(container *Container) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) setupContainerDns() error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) updateParentsHosts() error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) setupLinkedContainers() ([]string, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) createDaemonEnvironment(linkedEnv []string) []string {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) initializeNetworking() error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) setupWorkingDirectory() error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) verifyDaemonSettings() {
|
||||||
|
}
|
||||||
|
|
||||||
|
func populateCommand(c *Container, env []string) error {
|
||||||
|
en := &execdriver.Network{
|
||||||
|
Mtu: c.daemon.config.Mtu,
|
||||||
|
Interface: nil,
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO Windows. Appropriate network mode (will refactor as part of
|
||||||
|
// libnetwork. For now, even through bridge not used, let it succeed to
|
||||||
|
// allow the Windows daemon to limp during its bring-up
|
||||||
|
parts := strings.SplitN(string(c.hostConfig.NetworkMode), ":", 2)
|
||||||
|
switch parts[0] {
|
||||||
|
case "none":
|
||||||
|
case "bridge", "": // empty string to support existing containers
|
||||||
|
if !c.Config.NetworkDisabled {
|
||||||
|
network := c.NetworkSettings
|
||||||
|
en.Interface = &execdriver.NetworkInterface{
|
||||||
|
Bridge: network.Bridge,
|
||||||
|
MacAddress: network.MacAddress,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case "host", "container":
|
||||||
|
return fmt.Errorf("unsupported network mode: %s", c.hostConfig.NetworkMode)
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("invalid network mode: %s", c.hostConfig.NetworkMode)
|
||||||
|
}
|
||||||
|
|
||||||
|
pid := &execdriver.Pid{}
|
||||||
|
|
||||||
|
// TODO Windows. This can probably be factored out.
|
||||||
|
pid.HostPid = c.hostConfig.PidMode.IsHost()
|
||||||
|
|
||||||
|
// TODO Windows. Resource controls to be implemented later.
|
||||||
|
resources := &execdriver.Resources{}
|
||||||
|
|
||||||
|
// TODO Windows. Further refactoring required (privileged/user)
|
||||||
|
processConfig := execdriver.ProcessConfig{
|
||||||
|
Privileged: c.hostConfig.Privileged,
|
||||||
|
Entrypoint: c.Path,
|
||||||
|
Arguments: c.Args,
|
||||||
|
Tty: c.Config.Tty,
|
||||||
|
User: c.Config.User,
|
||||||
|
}
|
||||||
|
|
||||||
|
processConfig.Env = env
|
||||||
|
|
||||||
|
// TODO Windows: Factor out remainder of unused fields.
|
||||||
|
c.command = &execdriver.Command{
|
||||||
|
ID: c.ID,
|
||||||
|
Rootfs: c.RootfsPath(),
|
||||||
|
ReadonlyRootfs: c.hostConfig.ReadonlyRootfs,
|
||||||
|
InitPath: "/.dockerinit",
|
||||||
|
WorkingDir: c.Config.WorkingDir,
|
||||||
|
Network: en,
|
||||||
|
Pid: pid,
|
||||||
|
Resources: resources,
|
||||||
|
CapAdd: c.hostConfig.CapAdd,
|
||||||
|
CapDrop: c.hostConfig.CapDrop,
|
||||||
|
ProcessConfig: processConfig,
|
||||||
|
ProcessLabel: c.GetProcessLabel(),
|
||||||
|
MountLabel: c.GetMountLabel(),
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSize, return real size, virtual size
|
||||||
|
func (container *Container) GetSize() (int64, int64) {
|
||||||
|
// TODO Windows
|
||||||
|
return 0, 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) AllocateNetwork() error {
|
||||||
|
|
||||||
|
// TODO Windows. This needs reworking with libnetwork. In the
|
||||||
|
// proof-of-concept for //build conference, the Windows daemon
|
||||||
|
// invoked eng.Job("allocate_interface) passing through
|
||||||
|
// RequestedMac.
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) ExportRw() (archive.Archive, error) {
|
||||||
|
if container.IsRunning() {
|
||||||
|
return nil, fmt.Errorf("Cannot export a running container.")
|
||||||
|
}
|
||||||
|
// TODO Windows. Implementation (different to Linux)
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) ReleaseNetwork() {
|
||||||
|
// TODO Windows. Rework with libnetwork
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) RestoreNetwork() error {
|
||||||
|
// TODO Windows. Rework with libnetwork
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func disableAllActiveLinks(container *Container) {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) DisableLink(name string) {
|
||||||
|
}
|
|
@ -155,10 +155,13 @@ func (daemon *Daemon) containerRoot(id string) string {
|
||||||
// This is typically done at startup.
|
// This is typically done at startup.
|
||||||
func (daemon *Daemon) load(id string) (*Container, error) {
|
func (daemon *Daemon) load(id string) (*Container, error) {
|
||||||
container := &Container{
|
container := &Container{
|
||||||
root: daemon.containerRoot(id),
|
CommonContainer: CommonContainer{
|
||||||
State: NewState(),
|
State: NewState(),
|
||||||
execCommands: newExecStore(),
|
root: daemon.containerRoot(id),
|
||||||
|
execCommands: newExecStore(),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := container.FromDisk(); err != nil {
|
if err := container.FromDisk(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -573,22 +576,24 @@ func (daemon *Daemon) newContainer(name string, config *runconfig.Config, imgID
|
||||||
entrypoint, args := daemon.getEntrypointAndArgs(config.Entrypoint, config.Cmd)
|
entrypoint, args := daemon.getEntrypointAndArgs(config.Entrypoint, config.Cmd)
|
||||||
|
|
||||||
container := &Container{
|
container := &Container{
|
||||||
// FIXME: we should generate the ID here instead of receiving it as an argument
|
CommonContainer: CommonContainer{
|
||||||
ID: id,
|
ID: id, // FIXME: we should generate the ID here instead of receiving it as an argument
|
||||||
Created: time.Now().UTC(),
|
Created: time.Now().UTC(),
|
||||||
Path: entrypoint,
|
Path: entrypoint,
|
||||||
Args: args, //FIXME: de-duplicate from config
|
Args: args, //FIXME: de-duplicate from config
|
||||||
Config: config,
|
Config: config,
|
||||||
hostConfig: &runconfig.HostConfig{},
|
hostConfig: &runconfig.HostConfig{},
|
||||||
ImageID: imgID,
|
ImageID: imgID,
|
||||||
NetworkSettings: &network.Settings{},
|
NetworkSettings: &network.Settings{},
|
||||||
Name: name,
|
Name: name,
|
||||||
Driver: daemon.driver.String(),
|
Driver: daemon.driver.String(),
|
||||||
ExecDriver: daemon.execDriver.Name(),
|
ExecDriver: daemon.execDriver.Name(),
|
||||||
State: NewState(),
|
State: NewState(),
|
||||||
execCommands: newExecStore(),
|
execCommands: newExecStore(),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
container.root = daemon.containerRoot(container.ID)
|
container.root = daemon.containerRoot(container.ID)
|
||||||
|
|
||||||
return container, err
|
return container, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,24 +14,38 @@ import (
|
||||||
|
|
||||||
func TestGet(t *testing.T) {
|
func TestGet(t *testing.T) {
|
||||||
c1 := &Container{
|
c1 := &Container{
|
||||||
ID: "5a4ff6a163ad4533d22d69a2b8960bf7fafdcba06e72d2febdba229008b0bf57",
|
CommonContainer: CommonContainer{
|
||||||
Name: "tender_bardeen",
|
ID: "5a4ff6a163ad4533d22d69a2b8960bf7fafdcba06e72d2febdba229008b0bf57",
|
||||||
|
Name: "tender_bardeen",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
c2 := &Container{
|
c2 := &Container{
|
||||||
ID: "3cdbd1aa394fd68559fd1441d6eff2ab7c1e6363582c82febfaa8045df3bd8de",
|
CommonContainer: CommonContainer{
|
||||||
Name: "drunk_hawking",
|
ID: "3cdbd1aa394fd68559fd1441d6eff2ab7c1e6363582c82febfaa8045df3bd8de",
|
||||||
|
Name: "drunk_hawking",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
c3 := &Container{
|
c3 := &Container{
|
||||||
ID: "3cdbd1aa394fd68559fd1441d6eff2abfafdcba06e72d2febdba229008b0bf57",
|
CommonContainer: CommonContainer{
|
||||||
Name: "3cdbd1aa",
|
ID: "3cdbd1aa394fd68559fd1441d6eff2abfafdcba06e72d2febdba229008b0bf57",
|
||||||
|
Name: "3cdbd1aa",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
c4 := &Container{
|
c4 := &Container{
|
||||||
ID: "75fb0b800922abdbef2d27e60abcdfaf7fb0698b2a96d22d3354da361a6ff4a5",
|
CommonContainer: CommonContainer{
|
||||||
Name: "5a4ff6a163ad4533d22d69a2b8960bf7fafdcba06e72d2febdba229008b0bf57",
|
ID: "75fb0b800922abdbef2d27e60abcdfaf7fb0698b2a96d22d3354da361a6ff4a5",
|
||||||
|
Name: "5a4ff6a163ad4533d22d69a2b8960bf7fafdcba06e72d2febdba229008b0bf57",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
c5 := &Container{
|
c5 := &Container{
|
||||||
ID: "d22d69a2b8960bf7fafdcba06e72d2febdba960bf7fafdcba06e72d2f9008b060b",
|
CommonContainer: CommonContainer{
|
||||||
Name: "d22d69a2b896",
|
ID: "d22d69a2b8960bf7fafdcba06e72d2febdba960bf7fafdcba06e72d2f9008b060b",
|
||||||
|
Name: "d22d69a2b896",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
store := &contStore{
|
store := &contStore{
|
||||||
|
|
|
@ -23,18 +23,6 @@ type volumeMount struct {
|
||||||
from string
|
from string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (container *Container) prepareVolumes() error {
|
|
||||||
if container.Volumes == nil || len(container.Volumes) == 0 {
|
|
||||||
container.Volumes = make(map[string]string)
|
|
||||||
container.VolumesRW = make(map[string]bool)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(container.hostConfig.VolumesFrom) > 0 && container.AppliedVolumesFrom == nil {
|
|
||||||
container.AppliedVolumesFrom = make(map[string]struct{})
|
|
||||||
}
|
|
||||||
return container.createVolumes()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) createVolumes() error {
|
func (container *Container) createVolumes() error {
|
||||||
mounts := make(map[string]*volumeMount)
|
mounts := make(map[string]*volumeMount)
|
||||||
|
|
||||||
|
@ -252,28 +240,6 @@ func (container *Container) specialMounts() []execdriver.Mount {
|
||||||
return mounts
|
return mounts
|
||||||
}
|
}
|
||||||
|
|
||||||
func (container *Container) setupMounts() error {
|
|
||||||
mounts := []execdriver.Mount{}
|
|
||||||
|
|
||||||
// Mount user specified volumes
|
|
||||||
// Note, these are not private because you may want propagation of (un)mounts from host
|
|
||||||
// volumes. For instance if you use -v /usr:/usr and the host later mounts /usr/share you
|
|
||||||
// want this new mount in the container
|
|
||||||
// These mounts must be ordered based on the length of the path that it is being mounted to (lexicographic)
|
|
||||||
for _, path := range container.sortedVolumeMounts() {
|
|
||||||
mounts = append(mounts, execdriver.Mount{
|
|
||||||
Source: container.Volumes[path],
|
|
||||||
Destination: path,
|
|
||||||
Writable: container.VolumesRW[path],
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
mounts = append(mounts, container.specialMounts()...)
|
|
||||||
|
|
||||||
container.command.Mounts = mounts
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (container *Container) volumeMounts() map[string]*volumeMount {
|
func (container *Container) volumeMounts() map[string]*volumeMount {
|
||||||
mounts := make(map[string]*volumeMount)
|
mounts := make(map[string]*volumeMount)
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ package daemon
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
|
"github.com/docker/docker/daemon/execdriver"
|
||||||
"github.com/docker/docker/pkg/system"
|
"github.com/docker/docker/pkg/system"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -22,3 +23,37 @@ func copyOwnership(source, destination string) error {
|
||||||
|
|
||||||
return os.Chmod(destination, os.FileMode(stat.Mode()))
|
return os.Chmod(destination, os.FileMode(stat.Mode()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (container *Container) prepareVolumes() error {
|
||||||
|
if container.Volumes == nil || len(container.Volumes) == 0 {
|
||||||
|
container.Volumes = make(map[string]string)
|
||||||
|
container.VolumesRW = make(map[string]bool)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(container.hostConfig.VolumesFrom) > 0 && container.AppliedVolumesFrom == nil {
|
||||||
|
container.AppliedVolumesFrom = make(map[string]struct{})
|
||||||
|
}
|
||||||
|
return container.createVolumes()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) setupMounts() error {
|
||||||
|
mounts := []execdriver.Mount{}
|
||||||
|
|
||||||
|
// Mount user specified volumes
|
||||||
|
// Note, these are not private because you may want propagation of (un)mounts from host
|
||||||
|
// volumes. For instance if you use -v /usr:/usr and the host later mounts /usr/share you
|
||||||
|
// want this new mount in the container
|
||||||
|
// These mounts must be ordered based on the length of the path that it is being mounted to (lexicographic)
|
||||||
|
for _, path := range container.sortedVolumeMounts() {
|
||||||
|
mounts = append(mounts, execdriver.Mount{
|
||||||
|
Source: container.Volumes[path],
|
||||||
|
Destination: path,
|
||||||
|
Writable: container.VolumesRW[path],
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
mounts = append(mounts, container.specialMounts()...)
|
||||||
|
|
||||||
|
container.command.Mounts = mounts
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
|
@ -6,3 +6,11 @@ package daemon
|
||||||
func copyOwnership(source, destination string) error {
|
func copyOwnership(source, destination string) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (container *Container) prepareVolumes() error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (container *Container) setupMounts() error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue