kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #28454 from glensc/init-args

Browse source 
do not require custom build of tini
This commit is contained in:
Alexander Morozov 2017-01-20 10:03:58 -08:00 committed by GitHub
commit 50a72c7467
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/oci_linux.go
View file

@ -581,7 +581,7 @@ func (daemon *Daemon) populateCommonSpec(s *specs.Spec, c *container.Container)
if c.HostConfig.PidMode.IsPrivate() { if c.HostConfig.PidMode.IsPrivate() {
if (c.HostConfig.Init != nil && *c.HostConfig.Init) || if (c.HostConfig.Init != nil && *c.HostConfig.Init) ||
(c.HostConfig.Init == nil && daemon.configStore.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 var path string
if daemon.configStore.InitPath == "" && c.HostConfig.InitPath == "" { if daemon.configStore.InitPath == "" && c.HostConfig.InitPath == "" {
path, err = exec.LookPath(DefaultInitBinary) path, err = exec.LookPath(DefaultInitBinary)

2
hack/dockerfile/install-binaries.sh
View file

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