Start updating for SRS 2022

This commit is contained in:
nemunaire 2021-02-13 18:20:12 +01:00
commit 8a3160da10
5 changed files with 66 additions and 40 deletions

View file

@ -1,33 +1,33 @@
kernel:
image: linuxkit/kernel:5.4.19
image: linuxkit/kernel:5.4.39
# cmdline: "console=tty0 console=ttyS0"
# cmdline: "console=tty0 adlin.network=alt"
cmdline: "console=tty0"
init:
- linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e
- linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03
- linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412
- linuxkit/ca-certificates:v0.7
- linuxkit/init:a68f9fa0c1d9dbfc9c23663749a0b7ac510cbe1c
- linuxkit/runc:v0.8
- linuxkit/containerd:1ae8f054e9fe792d1dbdb9a65f1b5e14491cb106
- linuxkit/ca-certificates:v0.8
# - linuxkit/firmware:v0.7
- linuxkit/getty:v0.7
- nemunaire/monit:f57bcdfc02e2523c714d657a4abda61d191aa15c
- linuxkit/getty:v0.8
- nemunaire/monit:efb921ff9d2e564dfa43880c608e87dce6ad22b1
# - nemunaire/iscsi-target:8872d1c5e0cefe3c36b60e873b8452aefb19d84d
onboot:
- name: sysctl
image: linuxkit/sysctl:v0.7
image: linuxkit/sysctl:v0.8
binds:
- /etc/sysctl.d/:/etc/sysctl.d/:ro
# Mount first drive to enable some persistance
- name: mount
image: linuxkit/mount:v0.7
image: linuxkit/mount:v0.8
command: ["/usr/bin/mountie", "-device", "/dev/sda", "/var/lib/adlin" ]
# Network: interface for login-validator
- name: login-iface-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:v0.8
command: ["/bin/sh", "-c", "ip a add 172.23.255.2/24 dev vethin-login; ip link set vethin-login up; ip route add default via 172.23.255.1;" ]
net: new
runtime:
@ -42,7 +42,7 @@ onboot:
# wg-manager
- name: wg-iface-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:v0.8
command: ["/bin/sh", "-c", "ip a add 172.17.0.15/16 dev vethin-wg; ip a add 10.224.32.251/24 dev vethin-wg; ip link set vethin-wg up; grep adlin.network=alt /proc/cmdline > /dev/null && ip route add default via 10.224.32.254 || ip route add default via 10.224.32.1; wg-quick up wg0; /sbin/iptables-restore < /etc/iptables/rules.v4;" ]
net: new
binds:
@ -60,7 +60,7 @@ onboot:
# token-validator
- name: validator-iface-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:v0.8
command: ["/bin/sh", "-c", "ip a add 172.23.200.1/24 dev vethin-vldtr; ip link set vethin-vldtr up; ip route add default via 172.23.200.254;" ]
net: new
runtime:
@ -73,7 +73,7 @@ onboot:
# domain name
- name: ns-iface-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:v0.8
command: ["/bin/sh", "-c", "ip a add 172.23.200.2/24 dev vethin-ns; ip link set vethin-ns up; ip route add default via 172.23.200.254;" ]
net: new
runtime:
@ -86,7 +86,7 @@ onboot:
# time server
- name: time-iface-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:v0.8
command: ["/bin/sh", "-c", "ip a add 172.23.200.3/24 dev vethin-time; ip link set vethin-time up; ip route add default via 172.23.200.254;" ]
net: new
runtime:
@ -99,7 +99,7 @@ onboot:
# mail server
- name: mail-iface-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:v0.8
command: ["/bin/sh", "-c", "ip a add 172.23.200.4/24 dev vethin-mail; ip link set vethin-mail up; ip route add default via 172.23.200.254;" ]
net: new
runtime:
@ -116,9 +116,9 @@ onboot:
services:
- name: rngd
image: linuxkit/rngd:v0.7
image: linuxkit/rngd:v0.8
- name: sshd
image: linuxkit/sshd:v0.7
image: linuxkit/sshd:v0.8
- name: dhcpd
image: joebiellik/dhcpd
@ -218,7 +218,7 @@ services:
- /etc/unbound:/etc/unbound:ro
- name: time
image: linuxkit/openntpd:v0.7
image: linuxkit/openntpd:v0.8
net: /run/netns/dmz-time
capabilities:
- CAP_NET_BIND_SERVICE