mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
b84bff7f8a
By default, exec uses the environment of the current process, however,
if `exec.Env` is not `nil`, the environment is discarded:
e73f489494/src/os/exec/exec.go (L57-L60)
> If Env is nil, the new process uses the current process's environment.
When adding a new environment variable, prepend the current environment,
to make sure it is not discarded.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
67 lines
1.6 KiB
Go
67 lines
1.6 KiB
Go
package logging
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/internal/test/fixtures/plugin"
|
|
"github.com/docker/docker/pkg/locker"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
var pluginBuildLock = locker.New()
|
|
|
|
func ensurePlugin(t *testing.T, name string) string {
|
|
pluginBuildLock.Lock(name)
|
|
defer pluginBuildLock.Unlock(name)
|
|
|
|
installPath := filepath.Join(os.Getenv("GOPATH"), "bin", name)
|
|
if _, err := os.Stat(installPath); err == nil {
|
|
return installPath
|
|
}
|
|
|
|
goBin, err := exec.LookPath("go")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
cmd := exec.Command(goBin, "build", "-o", installPath, "./"+filepath.Join("cmd", name))
|
|
cmd.Env = append(os.Environ(), "CGO_ENABLED=0")
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatal(errors.Wrapf(err, "error building basic plugin bin: %s", string(out)))
|
|
}
|
|
|
|
return installPath
|
|
}
|
|
|
|
func withSockPath(name string) func(*plugin.Config) {
|
|
return func(cfg *plugin.Config) {
|
|
cfg.Interface.Socket = name
|
|
}
|
|
}
|
|
|
|
func createPlugin(t *testing.T, client plugin.CreateClient, alias, bin string, opts ...plugin.CreateOpt) {
|
|
pluginBin := ensurePlugin(t, bin)
|
|
|
|
opts = append(opts, withSockPath("plugin.sock"))
|
|
opts = append(opts, plugin.WithBinary(pluginBin))
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
|
|
err := plugin.Create(ctx, client, alias, opts...)
|
|
cancel()
|
|
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
func asLogDriver(cfg *plugin.Config) {
|
|
cfg.Interface.Types = []types.PluginInterfaceType{
|
|
{Capability: "logdriver", Prefix: "docker", Version: "1.0"},
|
|
}
|
|
}
|