Merge pull request #1779 from AkihiroSuda/resolve-util-bin

shim: support non-default binary name

cmd/containerd-shim/main_unix.go

@@ -40,14 +40,15 @@ shim for container lifecycle and reconnection
 `
 
 var (
-	debugFlag         bool
+	debugFlag            bool
-	namespaceFlag     string
+	namespaceFlag        string
-	socketFlag        string
+	socketFlag           string
-	addressFlag       string
+	addressFlag          string
-	workdirFlag       string
+	workdirFlag          string
-	runtimeRootFlag   string
+	runtimeRootFlag      string
-	criuFlag          string
+	criuFlag             string
-	systemdCgroupFlag bool
+	systemdCgroupFlag    bool
+	containerdBinaryFlag string
 )
 
 func init() {
@@ -59,6 +60,9 @@ func init() {
 	flag.StringVar(&runtimeRootFlag, "runtime-root", proc.RuncRoot, "root directory for the runtime")
 	flag.StringVar(&criuFlag, "criu", "", "path to criu binary")
 	flag.BoolVar(&systemdCgroupFlag, "systemd-cgroup", false, "set runtime to use systemd-cgroup")
+	// currently, the `containerd publish` utility is embedded in the daemon binary.
+	// The daemon invokes `containerd-shim -containerd-binary ...` with its own os.Executable() path.
+	flag.StringVar(&containerdBinaryFlag, "containerd-binary", "containerd", "path to containerd binary (used for `containerd publish`)")
 	flag.Parse()
 }
 
@@ -202,7 +206,7 @@ func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event
 	if err != nil {
 		return err
 	}
-	cmd := exec.CommandContext(ctx, "containerd", "--address", l.address, "publish", "--topic", topic, "--namespace", ns)
+	cmd := exec.CommandContext(ctx, containerdBinaryFlag, "--address", l.address, "publish", "--topic", topic, "--namespace", ns)
 	cmd.Stdin = bytes.NewReader(data)
 	c, err := reaper.Default.Start(cmd)
 	if err != nil {

linux/shim/client/client.go

@@ -89,10 +89,15 @@ func WithStart(binary, address, daemonAddress, cgroup string, nonewns, debug boo
 }
 
 func newCommand(binary, daemonAddress string, nonewns, debug bool, config shim.Config, socket *os.File) *exec.Cmd {
+	selfExe, err := os.Executable()
+	if err != nil {
+		panic(err)
+	}
 	args := []string{
 		"-namespace", config.Namespace,
 		"-workdir", config.WorkDir,
 		"-address", daemonAddress,
+		"-containerd-binary", selfExe,
 	}
 
 	if config.Criu != "" {