Merge pull request #5437 from hashicorp/r-upstream-libcontainer-plain

Use upstream libcontainer package

drivers/shared/executor/executor_linux.go

@@ -19,7 +19,6 @@ import (
 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/nomad/client/stats"
 	cstructs "github.com/hashicorp/nomad/client/structs"
-	"github.com/hashicorp/nomad/helper/discover"
 	shelpers "github.com/hashicorp/nomad/helper/stats"
 	"github.com/hashicorp/nomad/helper/uuid"
 	"github.com/hashicorp/nomad/nomad/structs"
@@ -99,11 +98,6 @@ func NewExecutorWithIsolation(logger hclog.Logger) Executor {
 // Launch creates a new container in libcontainer and starts a new process with it
 func (l *LibcontainerExecutor) Launch(command *ExecCommand) (*ProcessState, error) {
 	l.logger.Debug("launching command", "command", command.Cmd, "args", strings.Join(command.Args, " "))
-	// Find the nomad executable to launch the executor process with
-	bin, err := discover.NomadExecutable()
-	if err != nil {
-		return nil, fmt.Errorf("unable to find the nomad binary: %v", err)
-	}
 
 	if command.Resources == nil {
 		command.Resources = &drivers.Resources{
@@ -126,7 +120,10 @@ func (l *LibcontainerExecutor) Launch(command *ExecCommand) (*ProcessState, erro
 	factory, err := libcontainer.New(
 		path.Join(command.TaskDir, "../alloc/container"),
 		libcontainer.Cgroupfs,
-		libcontainer.InitArgs(bin, "libcontainer-shim"),
+		// note that os.Args[0] refers to the executor shim typically
+		// and first args arguments is ignored now due
+		// until https://github.com/opencontainers/runc/pull/1888 is merged
+		libcontainer.InitArgs(os.Args[0], "libcontainer-shim"),
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create factory: %v", err)

nsenter_linux.go → drivers/shared/executor/libcontainer_nsenter_linux.go

@@ -1,4 +1,4 @@
-package main
+package executor
 
 import (
 	"os"
@@ -12,6 +12,9 @@ import (
 // init is only run on linux and is used when the LibcontainerExecutor starts
 // a new process. The libcontainer shim takes over the process, setting up the
 // configured isolation and limitions before execve into the user process
+//
+// This subcommand handler is implemented as an `init`, libcontainer shim is handled anywhere
+// this package is used (including tests) without needing to write special command handler.
 func init() {
 	if len(os.Args) > 1 && os.Args[1] == "libcontainer-shim" {
 		runtime.GOMAXPROCS(1)