Przeglądaj źródła

do not require custom build of tini

https://github.com/krallin/tini/issues/55#issuecomment-260507562
https://github.com/krallin/tini/issues/55#issuecomment-260538243
https://github.com/docker/docker/pull/28037

Signed-off-by: Elan Ruusamäe <glen@delfi.ee>
(cherry picked from commit d7df7315971653e11bab124800a5938e7e5c6316)
Signed-off-by: Victor Vieux <vieux@docker.com>
Elan Ruusamäe 8 lat temu
rodzic
commit
2dd2ac2c14
2 zmienionych plików z 2 dodań i 2 usunięć
  1. 1 1
      daemon/oci_linux.go
  2. 1 1
      hack/dockerfile/install-binaries.sh

+ 1 - 1
daemon/oci_linux.go

@@ -581,7 +581,7 @@ func (daemon *Daemon) populateCommonSpec(s *specs.Spec, c *container.Container)
 	if c.HostConfig.PidMode.IsPrivate() {
 		if (c.HostConfig.Init != nil && *c.HostConfig.Init) ||
 			(c.HostConfig.Init == nil && daemon.configStore.Init) {
-			s.Process.Args = append([]string{"/dev/init", c.Path}, c.Args...)
+			s.Process.Args = append([]string{"/dev/init", "--", c.Path}, c.Args...)
 			var path string
 			if daemon.configStore.InitPath == "" && c.HostConfig.InitPath == "" {
 				path, err = exec.LookPath(DefaultInitBinary)

+ 1 - 1
hack/dockerfile/install-binaries.sh

@@ -77,7 +77,7 @@ do
 			git clone https://github.com/krallin/tini.git "$GOPATH/tini"
 			cd "$GOPATH/tini"
 			git checkout -q "$TINI_COMMIT"
-			cmake -DMINIMAL=ON .
+			cmake .
 			make tini-static
 			cp tini-static /usr/local/bin/docker-init
 			;;