From 3184616936a62e48426f8bfcda9a94113ec66134 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Fri, 26 May 2017 15:41:26 -0700 Subject: [PATCH] Always use PATH-only env for rkt commands --- client/driver/rkt.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/client/driver/rkt.go b/client/driver/rkt.go index 6a26f027b..4f29e33b3 100644 --- a/client/driver/rkt.go +++ b/client/driver/rkt.go @@ -427,9 +427,9 @@ func (d *RktDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e // command itself needs an evironment with PATH set to find iptables. eb := env.NewEmptyBuilder() filter := strings.Split(d.config.ReadDefault("env.blacklist", config.DefaultEnvBlacklist), ",") - eb.SetHostEnvvars(filter) + rktEnv := eb.SetHostEnvvars(filter).Build() executorCtx := &executor.ExecutorContext{ - TaskEnv: eb.Build(), + TaskEnv: rktEnv, Driver: "rkt", AllocID: d.DriverContext.allocID, Task: task, @@ -479,7 +479,7 @@ func (d *RktDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e maxKill := d.DriverContext.config.MaxKillTimeout h := &rktHandle{ uuid: uuid, - env: ctx.TaskEnv, + env: rktEnv, taskDir: ctx.TaskDir, pluginClient: pluginClient, executor: execIntf, @@ -516,12 +516,18 @@ func (d *RktDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, error return nil, fmt.Errorf("error connecting to plugin: %v", err) } + // The task's environment is set via --set-env flags in Start, but the rkt + // command itself needs an evironment with PATH set to find iptables. + eb := env.NewEmptyBuilder() + filter := strings.Split(d.config.ReadDefault("env.blacklist", config.DefaultEnvBlacklist), ",") + rktEnv := eb.SetHostEnvvars(filter).Build() + ver, _ := exec.Version() d.logger.Printf("[DEBUG] driver.rkt: version of executor: %v", ver.Version) // Return a driver handle h := &rktHandle{ uuid: id.UUID, - env: ctx.TaskEnv, + env: rktEnv, taskDir: ctx.TaskDir, pluginClient: pluginClient, executorPid: id.ExecutorPid,