Used shared init with LinuxKit

With https://github.com/linuxkit/linuxkit/pull/2500 the init script
can be used for both bare metal and in Docker.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-09-12 14:54:20 +01:00
parent 69596e17dd
commit dff6dc2876
4 changed files with 11 additions and 14 deletions

View File

@ -1,8 +0,0 @@
init:
- mobytest/init-container:132e5ee824d41c70ade5fa10071f32170cb9561e
- linuxkit/runc:dfc0437161843bc0dfeb334cda7ffd6a18b76bcd
- linuxkit/containerd:d136569c66ce041853d762b7032456419e580efe
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
trust:
org:
- linuxkit

View File

@ -1,16 +1,15 @@
kernel:
image: "linuxkit/kernel:4.9.41"
cmdline: "console=ttyS0"
init:
- linuxkit/init:c7d651da1a5e308c757bc61ce6a41804ea843426
- linuxkit/runc:dfc0437161843bc0dfeb334cda7ffd6a18b76bcd
- linuxkit/containerd:d136569c66ce041853d762b7032456419e580efe
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot:
- name: dhcpcd
image: "linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7"
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec
env:
- INSECURE=true
- name: rngd
image: "linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e"
trust:

View File

@ -1,3 +1,8 @@
init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
services:
- name: nginx
image: "nginx:alpine"
@ -10,3 +15,4 @@ services:
trust:
org:
- library
- linuxkit

View File

@ -36,7 +36,7 @@ FROM scratch
COPY . ./
ENTRYPOINT ["/sbin/tini", "--", "/bin/rc.init"]
ENTRYPOINT ["/bin/rc.init"]
`
// For now this is a constant that we use in init section only to make