bb59129b2f
Pass the container's command via args Remove execin function and just look for an existing nspid file to join the namespace Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
145 lines
3.5 KiB
Go
145 lines
3.5 KiB
Go
// +build linux
|
|
|
|
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"github.com/dotcloud/docker/pkg/libcontainer"
|
|
"github.com/dotcloud/docker/pkg/libcontainer/network"
|
|
"github.com/dotcloud/docker/pkg/libcontainer/utils"
|
|
"github.com/dotcloud/docker/pkg/system"
|
|
"github.com/dotcloud/docker/pkg/term"
|
|
"io"
|
|
"io/ioutil"
|
|
"os"
|
|
"os/exec"
|
|
"syscall"
|
|
)
|
|
|
|
func execCommand(container *libcontainer.Container, args []string) (int, error) {
|
|
master, console, err := createMasterAndConsole()
|
|
if err != nil {
|
|
return -1, err
|
|
}
|
|
|
|
command := createCommand(container, console, args)
|
|
// create a pipe so that we can syncronize with the namespaced process and
|
|
// pass the veth name to the child
|
|
inPipe, err := command.StdinPipe()
|
|
if err != nil {
|
|
return -1, err
|
|
}
|
|
if err := command.Start(); err != nil {
|
|
return -1, err
|
|
}
|
|
if err := writePidFile(command); err != nil {
|
|
return -1, err
|
|
}
|
|
defer deletePidFile()
|
|
|
|
if container.Network != nil {
|
|
vethPair, err := setupVeth(container.Network.Bridge, command.Process.Pid)
|
|
if err != nil {
|
|
return -1, err
|
|
}
|
|
sendVethName(vethPair, inPipe)
|
|
}
|
|
|
|
go io.Copy(os.Stdout, master)
|
|
go io.Copy(master, os.Stdin)
|
|
|
|
state, err := setupWindow(master)
|
|
if err != nil {
|
|
command.Process.Kill()
|
|
return -1, err
|
|
}
|
|
defer term.RestoreTerminal(os.Stdin.Fd(), state)
|
|
|
|
if err := command.Wait(); err != nil {
|
|
if _, ok := err.(*exec.ExitError); !ok {
|
|
return -1, err
|
|
}
|
|
}
|
|
return command.ProcessState.Sys().(syscall.WaitStatus).ExitStatus(), nil
|
|
}
|
|
|
|
func sendVethName(name string, pipe io.WriteCloser) {
|
|
// write the veth pair name to the child's stdin then close the
|
|
// pipe so that the child stops waiting
|
|
fmt.Fprint(pipe, name)
|
|
pipe.Close()
|
|
}
|
|
|
|
func setupVeth(bridge string, nspid int) (string, error) {
|
|
name1, name2, err := createVethPair()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
if err := network.SetInterfaceMaster(name1, bridge); err != nil {
|
|
return "", err
|
|
}
|
|
if err := network.InterfaceUp(name1); err != nil {
|
|
return "", err
|
|
}
|
|
if err := network.SetInterfaceInNamespacePid(name2, nspid); err != nil {
|
|
return "", err
|
|
}
|
|
return name2, nil
|
|
}
|
|
|
|
func setupWindow(master *os.File) (*term.State, error) {
|
|
ws, err := term.GetWinsize(os.Stdin.Fd())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if err := term.SetWinsize(master.Fd(), ws); err != nil {
|
|
return nil, err
|
|
}
|
|
return term.SetRawTerminal(os.Stdin.Fd())
|
|
}
|
|
|
|
func createMasterAndConsole() (*os.File, string, error) {
|
|
master, err := os.OpenFile("/dev/ptmx", syscall.O_RDWR|syscall.O_NOCTTY|syscall.O_CLOEXEC, 0)
|
|
if err != nil {
|
|
return nil, "", err
|
|
}
|
|
console, err := system.Ptsname(master)
|
|
if err != nil {
|
|
return nil, "", err
|
|
}
|
|
if err := system.Unlockpt(master); err != nil {
|
|
return nil, "", err
|
|
}
|
|
return master, console, nil
|
|
}
|
|
|
|
func createVethPair() (name1 string, name2 string, err error) {
|
|
name1, err = utils.GenerateRandomName("dock", 4)
|
|
if err != nil {
|
|
return
|
|
}
|
|
name2, err = utils.GenerateRandomName("dock", 4)
|
|
if err != nil {
|
|
return
|
|
}
|
|
if err = network.CreateVethPair(name1, name2); err != nil {
|
|
return
|
|
}
|
|
return
|
|
}
|
|
|
|
func writePidFile(command *exec.Cmd) error {
|
|
return ioutil.WriteFile(".nspid", []byte(fmt.Sprint(command.Process.Pid)), 0655)
|
|
}
|
|
|
|
func deletePidFile() error {
|
|
return os.Remove(".nspid")
|
|
}
|
|
|
|
func createCommand(container *libcontainer.Container, console string, args []string) *exec.Cmd {
|
|
command := exec.Command("nsinit", append([]string{"init", console}, args...)...)
|
|
command.SysProcAttr = &syscall.SysProcAttr{
|
|
Cloneflags: uintptr(getNamespaceFlags(container.Namespaces) | syscall.CLONE_VFORK), // we need CLONE_VFORK so we can wait on the child
|
|
}
|
|
return command
|
|
}
|