diff --git a/examples/aws.yml b/examples/aws.yml index b18f1a66e..87df2286d 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -18,7 +18,7 @@ services: - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: sshd - image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b + image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index f234ad813..92af7f28b 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -15,7 +15,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 - name: sshd - image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b + image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/docker.yml b/examples/docker.yml index c09521d3a..51a7d2d33 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:08b704915af0ce90f8f40df5d41d4c1aa14ef83a + image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630 env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index da04208b8..9fdb491b5 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79 services: - name: getty - image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a + image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630 env: - INSECURE=true - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: sshd - image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b + image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index 73b3fe526..798680ce5 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:08b704915af0ce90f8f40df5d41d4c1aa14ef83a + image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index 512f1cb98..f0b63b639 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:08b704915af0ce90f8f40df5d41d4c1aa14ef83a + image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 682026dc8..03d7f2cdc 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e services: - name: getty - image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a + image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630 env: - INSECURE=true - name: rngd diff --git a/examples/packet.yml b/examples/packet.yml index 2caf01aa7..3e1f2bca7 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -15,7 +15,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 - name: sshd - image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b + image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index bbccd5612..168a397c0 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:08b704915af0ce90f8f40df5d41d4c1aa14ef83a + image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630 env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index 7bd9a9904..ed391fa73 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 services: - name: getty - image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a + image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630 env: - INSECURE=true - name: rngd @@ -19,7 +19,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 - name: sshd - image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b + image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index e265c62c1..119733626 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:08b704915af0ce90f8f40df5d41d4c1aa14ef83a + image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630 env: - INSECURE=true - name: rngd diff --git a/examples/vmware.yml b/examples/vmware.yml index 156664ff6..d23fa3f1a 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 services: - name: getty - image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a + image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630 env: - INSECURE=true - name: rngd diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index a5e6871f3..c606f5e06 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -19,7 +19,7 @@ onboot: command: ["sh", "-c", "mkdir /host_var/vpnkit && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] services: - name: sshd - image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b + image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c - name: vpnkit-forwarder image: linuxkit/vpnkit-forwarder:9c1545e7b093d1210118de7661d7346393ec195b binds: diff --git a/examples/vultr.yml b/examples/vultr.yml index 8cf4f699b..e014e801a 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79 services: - name: getty - image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a + image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630 env: - INSECURE=true - name: rngd image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b - name: sshd - image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b + image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile index cbcac9821..6a1e836e2 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:a39a433162a873519910a07beeb3e8db22529956 AS mirror +FROM linuxkit/alpine:4248059c38452217ff63853869df36034a890401 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -9,6 +9,7 @@ RUN apk add --no-cache --initdb -p /out \ musl \ tini \ util-linux \ + wireguard-tools \ && true RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index 2fe70e258..1ebe18619 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:a39a433162a873519910a07beeb3e8db22529956 AS mirror +FROM linuxkit/alpine:4248059c38452217ff63853869df36034a890401 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -10,6 +10,7 @@ RUN apk add --no-cache --initdb -p /out \ openssh-server \ tini \ util-linux \ + wireguard-tools \ && true RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories