From 34d266864073d3340b2e1dfa2c73d30c141f84a4 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Thu, 22 Feb 2018 08:39:23 +0000 Subject: [PATCH 1/2] Add s390 console to examples On z platform, the kernel console is ttysclp0. Signed-off-by: Alice Frosi --- examples/cadvisor.yml | 2 +- examples/docker.yml | 2 +- examples/getty.yml | 2 +- examples/hostmount-writeable-overlay.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 292ad075c..78f2dd16e 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.14.23 - cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 diff --git a/examples/docker.yml b/examples/docker.yml index 1daf48a71..7d14f74c9 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.14.23 - cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 diff --git a/examples/getty.yml b/examples/getty.yml index 1b0666d95..fea146e7f 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.14.23 - cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index c0a9192a9..81b427141 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.14.23 - cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 2a515ef9c..e896674c1 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -2,7 +2,7 @@ # connect: nc localhost 6379 kernel: image: linuxkit/kernel:4.14.23 - cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 diff --git a/examples/sshd.yml b/examples/sshd.yml index cdaaeb049..9cf2cb2cc 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.14.23 - cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 diff --git a/examples/swap.yml b/examples/swap.yml index 5f309a479..1d6d81347 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.14.23 - cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 From 1eb86681036cb152a1e1c7db3a7f557c624d4b42 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 6 Mar 2018 08:53:29 +0000 Subject: [PATCH 2/2] Update docker.yml The docker image docker:17.07.0-ce-dind does not support s390. Update to docker:17.09.0-ce-dind Signed-off-by: Alice Frosi --- examples/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/docker.yml b/examples/docker.yml index 7d14f74c9..ce9e79abf 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -28,7 +28,7 @@ services: - name: ntpd image: linuxkit/openntpd:v0.2 - name: docker - image: docker:17.07.0-ce-dind + image: docker:17.09.0-ce-dind capabilities: - all net: host