mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 17:26:28 +00:00
Merge pull request #2266 from zx2c4/add-wireguard-to-sshd-getty
Add wireguard to sshd and getty
This commit is contained in:
commit
6031c4bf5f
@ -18,7 +18,7 @@ services:
|
|||||||
- name: rngd
|
- name: rngd
|
||||||
image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b
|
image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b
|
||||||
- name: sshd
|
- name: sshd
|
||||||
image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b
|
image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c
|
||||||
binds:
|
binds:
|
||||||
- /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
- /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
||||||
- name: nginx
|
- name: nginx
|
||||||
|
@ -15,7 +15,7 @@ services:
|
|||||||
- name: dhcpcd
|
- name: dhcpcd
|
||||||
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
|
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
|
||||||
- name: sshd
|
- name: sshd
|
||||||
image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b
|
image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c
|
||||||
files:
|
files:
|
||||||
- path: root/.ssh/authorized_keys
|
- path: root/.ssh/authorized_keys
|
||||||
source: ~/.ssh/id_rsa.pub
|
source: ~/.ssh/id_rsa.pub
|
||||||
|
@ -20,7 +20,7 @@ onboot:
|
|||||||
command: ["/mount.sh", "/var/lib/docker"]
|
command: ["/mount.sh", "/var/lib/docker"]
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a
|
image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630
|
||||||
env:
|
env:
|
||||||
- INSECURE=true
|
- INSECURE=true
|
||||||
- name: rngd
|
- name: rngd
|
||||||
|
@ -16,13 +16,13 @@ onboot:
|
|||||||
image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79
|
image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a
|
image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630
|
||||||
env:
|
env:
|
||||||
- INSECURE=true
|
- INSECURE=true
|
||||||
- name: rngd
|
- name: rngd
|
||||||
image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b
|
image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b
|
||||||
- name: sshd
|
- name: sshd
|
||||||
image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b
|
image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c
|
||||||
binds:
|
binds:
|
||||||
- /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
- /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
||||||
- name: nginx
|
- name: nginx
|
||||||
|
@ -14,7 +14,7 @@ onboot:
|
|||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a
|
image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630
|
||||||
# to make insecure with passwordless root login, uncomment following lines
|
# to make insecure with passwordless root login, uncomment following lines
|
||||||
#env:
|
#env:
|
||||||
# - INSECURE=true
|
# - INSECURE=true
|
||||||
|
@ -11,7 +11,7 @@ onboot:
|
|||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a
|
image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630
|
||||||
env:
|
env:
|
||||||
- INSECURE=true
|
- INSECURE=true
|
||||||
trust:
|
trust:
|
||||||
|
@ -7,7 +7,7 @@ init:
|
|||||||
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
|
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a
|
image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630
|
||||||
env:
|
env:
|
||||||
- INSECURE=true
|
- INSECURE=true
|
||||||
- name: rngd
|
- name: rngd
|
||||||
|
@ -15,7 +15,7 @@ services:
|
|||||||
- name: dhcpcd
|
- name: dhcpcd
|
||||||
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
|
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
|
||||||
- name: sshd
|
- name: sshd
|
||||||
image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b
|
image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c
|
||||||
files:
|
files:
|
||||||
- path: root/.ssh/authorized_keys
|
- path: root/.ssh/authorized_keys
|
||||||
source: ~/.ssh/id_rsa.pub
|
source: ~/.ssh/id_rsa.pub
|
||||||
|
@ -13,7 +13,7 @@ onboot:
|
|||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a
|
image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630
|
||||||
env:
|
env:
|
||||||
- INSECURE=true
|
- INSECURE=true
|
||||||
- name: redis
|
- name: redis
|
||||||
|
@ -11,7 +11,7 @@ onboot:
|
|||||||
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
|
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a
|
image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630
|
||||||
env:
|
env:
|
||||||
- INSECURE=true
|
- INSECURE=true
|
||||||
- name: rngd
|
- name: rngd
|
||||||
@ -19,7 +19,7 @@ services:
|
|||||||
- name: dhcpcd
|
- name: dhcpcd
|
||||||
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
|
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
|
||||||
- name: sshd
|
- name: sshd
|
||||||
image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b
|
image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c
|
||||||
files:
|
files:
|
||||||
- path: root/.ssh/authorized_keys
|
- path: root/.ssh/authorized_keys
|
||||||
source: ~/.ssh/id_rsa.pub
|
source: ~/.ssh/id_rsa.pub
|
||||||
|
@ -24,7 +24,7 @@ onboot:
|
|||||||
command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"]
|
command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"]
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a
|
image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630
|
||||||
env:
|
env:
|
||||||
- INSECURE=true
|
- INSECURE=true
|
||||||
- name: rngd
|
- name: rngd
|
||||||
|
@ -11,7 +11,7 @@ onboot:
|
|||||||
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
|
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a
|
image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630
|
||||||
env:
|
env:
|
||||||
- INSECURE=true
|
- INSECURE=true
|
||||||
- name: rngd
|
- name: rngd
|
||||||
|
@ -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"]
|
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:
|
services:
|
||||||
- name: sshd
|
- name: sshd
|
||||||
image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b
|
image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c
|
||||||
- name: vpnkit-forwarder
|
- name: vpnkit-forwarder
|
||||||
image: linuxkit/vpnkit-forwarder:9c1545e7b093d1210118de7661d7346393ec195b
|
image: linuxkit/vpnkit-forwarder:9c1545e7b093d1210118de7661d7346393ec195b
|
||||||
binds:
|
binds:
|
||||||
|
@ -16,13 +16,13 @@ onboot:
|
|||||||
image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79
|
image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a
|
image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630
|
||||||
env:
|
env:
|
||||||
- INSECURE=true
|
- INSECURE=true
|
||||||
- name: rngd
|
- name: rngd
|
||||||
image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b
|
image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b
|
||||||
- name: sshd
|
- name: sshd
|
||||||
image: linuxkit/sshd:dc98a72c1d1285c30f2db176252f3ce2bf645d5b
|
image: linuxkit/sshd:9e9186dd5989ae9c604eba77e306b0e67500b55c
|
||||||
binds:
|
binds:
|
||||||
- /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
- /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
||||||
- name: nginx
|
- name: nginx
|
||||||
|
@ -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 mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
|
||||||
RUN apk add --no-cache --initdb -p /out \
|
RUN apk add --no-cache --initdb -p /out \
|
||||||
@ -9,6 +9,7 @@ RUN apk add --no-cache --initdb -p /out \
|
|||||||
musl \
|
musl \
|
||||||
tini \
|
tini \
|
||||||
util-linux \
|
util-linux \
|
||||||
|
wireguard-tools \
|
||||||
&& true
|
&& true
|
||||||
RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
|
RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
|
||||||
|
|
||||||
|
@ -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 mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
|
||||||
RUN apk add --no-cache --initdb -p /out \
|
RUN apk add --no-cache --initdb -p /out \
|
||||||
@ -10,6 +10,7 @@ RUN apk add --no-cache --initdb -p /out \
|
|||||||
openssh-server \
|
openssh-server \
|
||||||
tini \
|
tini \
|
||||||
util-linux \
|
util-linux \
|
||||||
|
wireguard-tools \
|
||||||
&& true
|
&& true
|
||||||
RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
|
RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user