зеркало из https://github.com/microsoft/docker.git
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>
This commit is contained in:
Родитель
5f577bfa6b
Коммит
d7df731597
|
@ -593,7 +593,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)
|
||||
|
|
|
@ -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
|
||||
;;
|
||||
|
|
Загрузка…
Ссылка в новой задаче