1. docker
  2. Commit 2dd2ac2c14f89a7990973332bebb73cef3597459
Browse code

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 authored on 2016/11/16 07:07:13
Showing 2 changed files
daemon/oci_linux.go
History View file @ 2dd2ac2
... ... 
@@ -581,7 +581,7 @@ func (daemon *Daemon) populateCommonSpec(s *specs.Spec, c *container.Container)
581 581 
 	if c.HostConfig.PidMode.IsPrivate() {
582 582 
 		if (c.HostConfig.Init != nil && *c.HostConfig.Init) ||
583 583 
 			(c.HostConfig.Init == nil && daemon.configStore.Init) {
584 
-			s.Process.Args = append([]string{"/dev/init", c.Path}, c.Args...)
584 
+			s.Process.Args = append([]string{"/dev/init", "--", c.Path}, c.Args...)
585 585 
 			var path string
586 586 
 			if daemon.configStore.InitPath == "" && c.HostConfig.InitPath == "" {
587 587 
 				path, err = exec.LookPath(DefaultInitBinary)
hack/dockerfile/install-binaries.sh
History View file @ 2dd2ac2
... ... 
@@ -77,7 +77,7 @@ do
77 77 
 			git clone https://github.com/krallin/tini.git "$GOPATH/tini"
78 78 
 			cd "$GOPATH/tini"
79 79 
 			git checkout -q "$TINI_COMMIT"
80 
-			cmake -DMINIMAL=ON .
80 
+			cmake .
81 81 
 			make tini-static
82 82 
 			cp tini-static /usr/local/bin/docker-init
83 83 
 			;;