diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5bb4821d5..cf35ec4f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -225,7 +225,7 @@ jobs: test_linuxkit: name: LinuxKit Build Tests - needs: build + needs: [ build_packages, build ] runs-on: ubuntu-latest steps: - name: Check out code @@ -244,6 +244,14 @@ jobs: path: bin key: rtf-${{hashFiles('Makefile')}} + - name: Restore Package Cache + uses: actions/cache@v2 + with: + path: ~/.linuxkit/cache/ + key: ${{ runner.os }}-linuxkit-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-linuxkit- + - name: Build RTF if: steps.cache-rtf.outputs.cache-hit != 'true' run: make bin/rtf diff --git a/examples/addbinds.yml b/examples/addbinds.yml index 0ab1e831c..11579f5ee 100644 --- a/examples/addbinds.yml +++ b/examples/addbinds.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c binds.add: # this will keep all of the existing ones as well - /var/tmp:/var/tmp diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 903369efd..767f67fa8 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -22,7 +22,7 @@ onboot: services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index 0251df50b..8f6467a62 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -34,7 +34,7 @@ onboot: - /var:/var services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index 31f258345..ae4b4e31f 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -28,7 +28,7 @@ onboot: - /var:/var services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index f172a65b5..f77c4ac5f 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -52,7 +52,7 @@ services: image: linuxkit/acpid:c05a368754f6436b326945dc16135ba547568d8d # Enable getty for easier debugging - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true # Run ntpd to keep time synchronised in the VM diff --git a/examples/docker.yml b/examples/docker.yml index 18a40c421..b60c01eb5 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -18,7 +18,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/examples/getty.yml b/examples/getty.yml index 08eeffe68..d130b8ade 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:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 6f1befe01..694820a48 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true runtime: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index f40dce2a4..df28cb287 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -12,7 +12,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: influxdb diff --git a/examples/logging.yml b/examples/logging.yml index 303ac80c7..220279f80 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -17,7 +17,7 @@ onboot: services: # Inside the getty type `/proc/1/root/usr/bin/logread -F` to follow the log - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true # A service which generates log messages for testing diff --git a/examples/minimal.yml b/examples/minimal.yml index 3208d53e8..648ab6d7a 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -11,6 +11,6 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 1633e0ee9..d7232ae52 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/examples/platform-gcp.yml b/examples/platform-gcp.yml index 205c4f0fd..dff231f85 100644 --- a/examples/platform-gcp.yml +++ b/examples/platform-gcp.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/examples/platform-hetzner.yml b/examples/platform-hetzner.yml index 7cb86fb7c..477eb4bd4 100644 --- a/examples/platform-hetzner.yml +++ b/examples/platform-hetzner.yml @@ -24,7 +24,7 @@ services: - name: rngd image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: sshd diff --git a/examples/platform-packet.yml b/examples/platform-packet.yml index 544d83836..ec13ee2b4 100644 --- a/examples/platform-packet.yml +++ b/examples/platform-packet.yml @@ -24,7 +24,7 @@ services: - name: rngd image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: sshd diff --git a/examples/platform-rt-for-vmware.yml b/examples/platform-rt-for-vmware.yml index 57ff3b812..d5d54c8cb 100644 --- a/examples/platform-rt-for-vmware.yml +++ b/examples/platform-rt-for-vmware.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/examples/platform-scaleway.yml b/examples/platform-scaleway.yml index 43baf4f97..6cc9f35d2 100644 --- a/examples/platform-scaleway.yml +++ b/examples/platform-scaleway.yml @@ -19,7 +19,7 @@ onboot: image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/examples/platform-vmware.yml b/examples/platform-vmware.yml index 821122293..68a034416 100644 --- a/examples/platform-vmware.yml +++ b/examples/platform-vmware.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/examples/platform-vultr.yml b/examples/platform-vultr.yml index b73f58d7e..9032b688c 100644 --- a/examples/platform-vultr.yml +++ b/examples/platform-vultr.yml @@ -17,7 +17,7 @@ onboot: command: ["/usr/bin/metadata", "vultr"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 6ea3ceb1f..5bfcf1658 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:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true # Currently redis:4.0.6-alpine has trust issue with multi-arch diff --git a/examples/sshd.yml b/examples/sshd.yml index 0c8563fd8..507ea1e3a 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/examples/static-ip.yml b/examples/static-ip.yml index 2403cab22..fb9d68503 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -13,7 +13,7 @@ onboot: command: ["ip", "-b", "/etc/ip/eth0.conf"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true files: diff --git a/examples/swap.yml b/examples/swap.yml index 5546c4072..4c67e23a2 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:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/examples/tpm.yml b/examples/tpm.yml index 2688103c7..775a4cbfe 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: tss diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 59ae7b0cf..081633678 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -40,7 +40,7 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true net: /run/netns/wg1 diff --git a/linuxkit.yml b/linuxkit.yml index 1f54a5c8f..38df7131c 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/pkg/getty/usr/bin/rungetty.sh b/pkg/getty/usr/bin/rungetty.sh index 9a3ba9599..61b5920e9 100755 --- a/pkg/getty/usr/bin/rungetty.sh +++ b/pkg/getty/usr/bin/rungetty.sh @@ -82,4 +82,4 @@ for opt in $(cat /proc/cmdline); do done # if we are in a container (not in root init) wait for all our child process to exit; tini will handle subreaping, if necessary -[ -z "$INITGETTY" ] && wait +[ -n "$INITGETTY" ] || wait diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 8570b9a0c..6b3eb933c 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -21,7 +21,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index d7b756afe..c4be1dc8c 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -21,7 +21,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 9ad2e1ba4..6c7e79802 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -11,7 +11,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 9dd2c87dc..b61c698e2 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index b45059aba..e5b043737 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:4696ba61c3ec091328e1c14857d77e675802342f - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 69dc93f7f..b03112c86 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -13,7 +13,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index d95c4f6a9..d4ee6fbe2 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c env: - INSECURE=true - name: rngd diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index ceeffdeda..aeae2971c 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -12,7 +12,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 + image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes)