Ian Campbell
8270bdfe33
Use exec in a couple of places to avoid needless lingering /bin/sh processes
...
```
$ apk -U add procps
$ ps xf
1 ? Ss 0:05 /sbin/init
357 ? Ss 0:00 /bin/sh /etc/init.d/containerd
359 ? Sl 0:00 \_ /usr/bin/containerd
360 ? Ss 0:00 /bin/sh /etc/init.d/containers
432 ? Sl 0:00 \_ /usr/bin/runc run --bundle /containers/daemon/swa
466 ? Ssl 0:00 | \_ /usr/bin/swarmd --containerd-addr=/run/contai
427 ? Sl 0:00 \_ /usr/bin/runc run --bundle /containers/daemon/dhc
457 ? Ss 0:00 | \_ bin/sh /usr/local/bin/start_dhcpcd.sh
474 ? S 0:00 | \_ /sbin/dhcpcd --nobackground
429 ? Sl 0:00 \_ /usr/bin/runc run --bundle /containers/daemon/rng
576 ? Ss 0:00 \_ /bin/tini /usr/sbin/rngd -f
580 ? S 0:00 \_ /usr/sbin/rngd -f
```
becomes
```
$ ps xf
1 ? Ss 0:06 /sbin/init
358 ? Ss 0:00 /bin/sh /etc/init.d/containers
426 ? Sl 0:00 \_ /usr/bin/runc run --bundle /containers/daemon/dhc
458 ? Ss 0:00 | \_ /sbin/dhcpcd --nobackground
431 ? Sl 0:00 \_ /usr/bin/runc run --bundle /containers/daemon/swa
460 ? Ssl 0:00 | \_ /usr/bin/swarmd --containerd-addr=/run/contai
428 ? Sl 0:00 \_ /usr/bin/runc run --bundle /containers/daemon/rng
574 ? Ss 0:00 \_ /bin/tini /usr/sbin/rngd -f
578 ? S 0:00 \_ /usr/sbin/rngd -f
356 ? Ssl 0:00 /usr/bin/containerd
```
Specifically these are gone:
357 ? Ss 0:00 /bin/sh /etc/init.d/containerd
457 ? Ss 0:00 | \_ bin/sh /usr/local/bin/start_dhcpcd.sh
Signed-off-by: Ian Campbell <ian.campbell@docker.com >
2017-04-06 09:34:38 +01:00
Riyaz Faizullabhoy
a33b9ff4b1
dhcpcd system container
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2017-04-04 08:23:47 -07:00
Ian Campbell
709402d780
Update to runc ef9a4b315558d31eae520725ff67383c2f79c3cb
...
This is compatible with containerd 8353da59c6ae7e1933aac2228df23541ef8b163f
which was picked up by d2caae4c1a .
This required jiggering with riddler output some more to update to new OCI
config.json format for capabilities.
Signed-off-by: Ian Campbell <ian.campbell@docker.com >
2017-04-03 16:47:14 +01:00
Ian Campbell
31e0a848e1
pkg/init: ruinc and containerd binaries depend on Makefile
...
Since Makefile contains the hashes we need a dependency otherwise changing the
hashes does not necessarily result in the binaries getting updated.
Signed-off-by: Ian Campbell <ian.campbell@docker.com >
2017-03-30 17:20:59 +01:00
Rolf Neugebauer
eac2fdd88d
init: Enable tty? as console
...
Enable tty0 and friends as console and start getty on them.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com >
2017-03-28 10:46:58 +01:00
Justin Cormack
7b79053306
Update containerd to current master
...
- now supports image pull and run end to end
- update runc to last version before spec update fix #1302
- remove ext2 utils from init
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-03-25 18:15:52 +00:00
Justin Cormack
905636d642
Move installable packages to pkg
...
Still leaves some intermediate repos in `base/`
See #1266
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-03-22 12:33:11 +00:00