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 <ian.campbell@docker.com>
This commit is contained in:
Ian Campbell 2017-06-14 15:34:07 +01:00
parent 42aa787598
commit f7b2a739ee
15 changed files with 15 additions and 15 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -7,7 +7,7 @@ init:
- linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a
services:
- name: getty
image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a"
image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5"
env:
- INSECURE=true
- name: rngd

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"]}'

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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