From f7b2a739eed5364ce11012439c871e75a103bb79 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 14 Jun 2017 15:34:07 +0100 Subject: [PATCH] pkg/getty: Stop bind mounting /tmp/ctr This doesn't exist with newer ctr or in systems where service containers are not started using the ctr tool. All it contains today are the stdio FIFOs, which are not in general useful to access after container creation. Signed-off-by: Ian Campbell --- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/vmware.yml | 2 +- linuxkit.yml | 2 +- pkg/getty/Dockerfile | 2 +- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/docker.yml b/examples/docker.yml index 1b7a4e377..0893e5601 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -20,7 +20,7 @@ onboot: command: ["/mount.sh", "/var/lib/docker"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index 994a916bb..037b1d547 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -16,7 +16,7 @@ onboot: image: "linuxkit/metadata:31a0b0f5557c6123beaa9c33e3400ae3c03447e0" services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/getty.yml b/examples/getty.yml index 653f39f2c..7cd6f4fe7 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index e1280c0b3..ea0db8e2e 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -11,7 +11,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 186f426f7..bbba98361 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/redis-os.yml b/examples/redis-os.yml index d8facd09c..75f15f799 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -13,7 +13,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index ff70a9c9a..8eda6e34c 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -11,7 +11,7 @@ onboot: image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/swap.yml b/examples/swap.yml index d2bce7b68..089ca6fa7 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -24,7 +24,7 @@ onboot: command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/vmware.yml b/examples/vmware.yml index d7d753b32..e1e1440e5 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -11,7 +11,7 @@ onboot: image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/linuxkit.yml b/linuxkit.yml index ebe376f2e..c89aa9fa1 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -16,7 +16,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile index 0292384cf..defd12c3f 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -28,4 +28,4 @@ COPY --from=mirror /out/ / COPY usr/ /usr/ COPY etc/ /etc/ CMD ["/usr/bin/rungetty.sh"] -LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/run:/run", "/etc:/hostroot/etc","/tmp/ctr:/tmp/ctr", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/dist:/usr/bin/dist", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' +LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/run:/run", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/dist:/usr/bin/dist", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 7dd4b8911..5286c4dd0 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -26,7 +26,7 @@ onboot: - /var:/var:rshared,rbind services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 2f04500e6..f24517017 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -26,7 +26,7 @@ onboot: - /var:/var:rshared,rbind services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 5e0780b07..69761e0e5 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -30,7 +30,7 @@ services: - name: sshd image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true files: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 5d6bdbb70..fb0b6fde6 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -16,7 +16,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd