github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1810 from justincormack/init-clean

Browse Source 
Init clean up
This commit is contained in:
Justin Cormack 2017-05-12 16:09:21 +01:00 committed by GitHub
commit 2388f483c3
25 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/docker.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
examples/gcp.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
examples/minimal.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
onboot: onboot:

2
examples/node_exporter.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d
services: services:

2
examples/packet.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS1 page_poison=1" cmdline: "console=ttyS1 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
examples/redis-os.yml
View File

@ -4,7 +4,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
services: services:

2
examples/sshd.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
examples/vmware.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=tty0 page_poison=1" cmdline: "console=tty0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
linuxkit.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

4
pkg/binfmt/.gitignore vendored
View File

@ -1,4 +0,0 @@
dev
proc
sys
usr

2
pkg/init/.gitignore vendored
View File

@ -1,2 +0,0 @@
sbin/
usr/

3
pkg/init/Dockerfile
View File

@ -3,4 +3,5 @@ FROM alpine:edge@sha256:99588bc8883c955c157d18fc3eaa4a3c1400c223e6c7cabca5f600a3
ENTRYPOINT [] ENTRYPOINT []
CMD [] CMD []
WORKDIR / WORKDIR /
COPY . ./ COPY init /
COPY etc etc/

5
pkg/rngd/.gitignore vendored
View File

@ -1,5 +0,0 @@
bin
dev
proc
sys
usr

2
projects/clear-containers/clear-containers.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel-clear-containers:4.9.x" image: "linuxkit/kernel-clear-containers:4.9.x"
cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on" cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
onboot: onboot:
- name: sysctl - name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

2
projects/etcd/etcd.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
projects/etcd/prom-us-central1-f.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

2
projects/kubernetes/kube-master.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
projects/kubernetes/kube-node.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
projects/landlock/landlock.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel-landlock:4.9.x" image: "mobylinux/kernel-landlock:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

2
projects/okernel/examples/okernel_simple.yaml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/okernel:latest" image: "linuxkit/okernel:latest"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
test/cases/test-docker-bench.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
test/cases/test-kernel-config.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
test/cases/test-ltp.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
test/cases/test-virtsock-server.yml
View File

@ -6,7 +6,7 @@ kernel:
# image: "linuxkit/kernel:4.4.x" # image: "linuxkit/kernel:4.4.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

2
test/kmod/kmod.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
onboot: onboot: