mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
1617be92d3
- github.com/containerd/go-runc 7d11b49dc0...e029b79d8c
- containerd/go-runc#52 Fix Method of judging command execution failure
- fixes "init.pid: no such file or directory: unknown" errors
- containerd/go-runc#54 avoid setting NOTIFY_SOCKET from calling process
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
56 lines
1.4 KiB
Go
56 lines
1.4 KiB
Go
/*
|
|
Copyright The containerd Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package runc
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"syscall"
|
|
)
|
|
|
|
func (r *Runc) command(context context.Context, args ...string) *exec.Cmd {
|
|
command := r.Command
|
|
if command == "" {
|
|
command = DefaultCommand
|
|
}
|
|
cmd := exec.CommandContext(context, command, append(r.args(), args...)...)
|
|
cmd.SysProcAttr = &syscall.SysProcAttr{
|
|
Setpgid: r.Setpgid,
|
|
}
|
|
cmd.Env = filterEnv(os.Environ(), "NOTIFY_SOCKET") // NOTIFY_SOCKET introduces a special behavior in runc but should only be set if invoked from systemd
|
|
if r.PdeathSignal != 0 {
|
|
cmd.SysProcAttr.Pdeathsig = r.PdeathSignal
|
|
}
|
|
|
|
return cmd
|
|
}
|
|
|
|
func filterEnv(in []string, names ...string) []string {
|
|
out := make([]string, 0, len(in))
|
|
loop0:
|
|
for _, v := range in {
|
|
for _, k := range names {
|
|
if strings.HasPrefix(v, k+"=") {
|
|
continue loop0
|
|
}
|
|
}
|
|
out = append(out, v)
|
|
}
|
|
return out
|
|
}
|