Merge pull request #8856 from unclejack/reexec_pkg

pkg/reexec: move reexec code to a new package
This commit is contained in:
Michael Crosby 2014-10-30 12:14:37 -07:00
commit d0197f4f7e
10 changed files with 8 additions and 7 deletions

View file

@ -13,7 +13,7 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/docker/docker/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/docker/libcontainer/netlink" "github.com/docker/libcontainer/netlink"
) )

View file

@ -11,7 +11,7 @@ import (
"runtime" "runtime"
"github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/docker/libcontainer" "github.com/docker/libcontainer"
"github.com/docker/libcontainer/namespaces" "github.com/docker/libcontainer/namespaces"
) )

View file

@ -10,7 +10,7 @@ import (
"path/filepath" "path/filepath"
"runtime" "runtime"
"github.com/docker/docker/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/docker/libcontainer" "github.com/docker/libcontainer"
"github.com/docker/libcontainer/namespaces" "github.com/docker/libcontainer/namespaces"
"github.com/docker/libcontainer/syncpipe" "github.com/docker/libcontainer/syncpipe"

View file

@ -14,7 +14,7 @@ import (
"time" "time"
"github.com/docker/docker/pkg/proxy" "github.com/docker/docker/pkg/proxy"
"github.com/docker/docker/reexec" "github.com/docker/docker/pkg/reexec"
) )
const userlandProxyCommandName = "docker-proxy" const userlandProxyCommandName = "docker-proxy"

View file

@ -13,7 +13,7 @@ import (
"github.com/docker/docker/api/client" "github.com/docker/docker/api/client"
"github.com/docker/docker/dockerversion" "github.com/docker/docker/dockerversion"
flag "github.com/docker/docker/pkg/mflag" flag "github.com/docker/docker/pkg/mflag"
"github.com/docker/docker/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/docker/docker/utils" "github.com/docker/docker/utils"
) )

View file

@ -3,7 +3,7 @@ package main
import ( import (
_ "github.com/docker/docker/daemon/execdriver/lxc" _ "github.com/docker/docker/daemon/execdriver/lxc"
_ "github.com/docker/docker/daemon/execdriver/native" _ "github.com/docker/docker/daemon/execdriver/native"
"github.com/docker/docker/reexec" "github.com/docker/docker/pkg/reexec"
) )
func main() { func main() {

View file

@ -22,7 +22,7 @@ import (
"github.com/docker/docker/image" "github.com/docker/docker/image"
"github.com/docker/docker/nat" "github.com/docker/docker/nat"
"github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/docker/docker/runconfig" "github.com/docker/docker/runconfig"
"github.com/docker/docker/utils" "github.com/docker/docker/utils"
) )

1
pkg/reexec/MAINTAINERS Normal file
View file

@ -0,0 +1 @@
Michael Crosby <michael@docker.com> (@crosbymichael)