github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2946 from alicefr/support_s390_console

Browse Source 
Add s390 console to examples
This commit is contained in:
Rolf Neugebauer 2018-03-06 14:53:31 +01:00 committed by GitHub
commit 6445b5e290
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/cadvisor.yml
View File

@ -1,6 +1,6 @@
kernel: kernel:
image: linuxkit/kernel:4.14.23 image: linuxkit/kernel:4.14.23
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init: init:
- linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a
- linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731

4
examples/docker.yml
View File

@ -1,6 +1,6 @@
kernel: kernel:
image: linuxkit/kernel:4.14.23 image: linuxkit/kernel:4.14.23
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init: init:
- linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a
- linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731
@ -28,7 +28,7 @@ services:
- name: ntpd - name: ntpd
image: linuxkit/openntpd:v0.2 image: linuxkit/openntpd:v0.2
- name: docker - name: docker
image: docker:17.07.0-ce-dind image: docker:17.09.0-ce-dind
capabilities: capabilities:
- all - all
net: host net: host

2
examples/getty.yml
View File

@ -1,6 +1,6 @@
kernel: kernel:
image: linuxkit/kernel:4.14.23 image: linuxkit/kernel:4.14.23
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init: init:
- linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a
- linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731

2
examples/hostmount-writeable-overlay.yml
View File

@ -1,6 +1,6 @@
kernel: kernel:
image: linuxkit/kernel:4.14.23 image: linuxkit/kernel:4.14.23
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init: init:
- linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a
- linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731

2
examples/redis-os.yml
View File

@ -2,7 +2,7 @@
# connect: nc localhost 6379 # connect: nc localhost 6379
kernel: kernel:
image: linuxkit/kernel:4.14.23 image: linuxkit/kernel:4.14.23
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init: init:
- linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a
- linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731

2
examples/sshd.yml
View File

@ -1,6 +1,6 @@
kernel: kernel:
image: linuxkit/kernel:4.14.23 image: linuxkit/kernel:4.14.23
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init: init:
- linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a
- linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731

2
examples/swap.yml
View File

@ -1,6 +1,6 @@
kernel: kernel:
image: linuxkit/kernel:4.14.23 image: linuxkit/kernel:4.14.23
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init: init:
- linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a
- linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731