From dd29fede676ac0ca09a789d62b2359c0de28c938 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sun, 19 Feb 2023 19:08:40 +0100 Subject: [PATCH] Update linuxkit images --- server.yml | 34 +++++++++++++++++----------------- tuto2.yml | 2 +- tuto3.yml | 32 ++++++++++++++++---------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/server.yml b/server.yml index 41ae539..de0738c 100644 --- a/server.yml +++ b/server.yml @@ -1,33 +1,33 @@ kernel: - image: linuxkit/kernel:5.10.92 + image: linuxkit/kernel:5.10.104 # cmdline: "console=tty0 console=ttyS0" # cmdline: "console=tty0 adlin.network=alt" cmdline: "console=tty0" init: - - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 - - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 -# - linuxkit/firmware:v0.7 - - linuxkit/getty:3c6e89681a988c3d4e2610fcd7aaaa0247ded3ec + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 +# - linuxkit/firmware:a17106a98940006529c714a3783eb03238c335a7 + - linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 - nemunaire/monit:90a16ed909ca82b5a2a277cb290301e97ee36063 # - nemunaire/iscsi-target:8872d1c5e0cefe3c36b60e873b8452aefb19d84d onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 binds: - /etc/sysctl.d/:/etc/sysctl.d/:ro # Mount first drive to enable some persistance - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "-device", "/dev/sda", "/var/lib/adlin" ] # Network: interface for login-validator - name: login-iface-setup - image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf + image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 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:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf + image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 command: ["/bin/sh", "-c", "ip a add 172.17.0.15/16 dev vethin-wg; ip a add 10.224.33.251/24 dev vethin-wg; ip link set vethin-wg address 0e:f2:7e:10:58:69; ip link set vethin-wg up; ip route add default via 10.224.33.252; 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:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf + image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 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:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf + image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 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:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf + image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 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:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf + image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 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:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: sshd - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 - name: dhcpd image: joebiellik/dhcpd diff --git a/tuto2.yml b/tuto2.yml index 29b5b35..85a7234 100644 --- a/tuto2.yml +++ b/tuto2.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.92 + image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 root=/dev/sda1 root=/dev/sr0 adlin.format=/dev/sda quiet" init: diff --git a/tuto3.yml b/tuto3.yml index 8c90bd1..4d3367a 100644 --- a/tuto3.yml +++ b/tuto3.yml @@ -4,33 +4,33 @@ kernel: cmdline: "console=tty0" init: - - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 - - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - - linuxkit/getty:3c6e89681a988c3d4e2610fcd7aaaa0247ded3ec + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 + - linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 onboot: - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "/dev/sda"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/dev/sda1", "/var/lib/adlin"] - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 binds: - /etc/sysctl.d/:/etc/sysctl.d/:ro - name: rngd1 - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 command: ["/sbin/rngd", "-1"] # Network: external - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1", "eth0"] net: new runtime: @@ -41,7 +41,7 @@ onboot: services: - name: dhcpcd-wks-dg1 - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 hostname: wks-dg1 net: new pid: new @@ -57,7 +57,7 @@ services: - /var/lib/adlin/wks-dg1resolv.conf:/etc/resolv.conf - name: dhcpcd-wks-rh1 - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 hostname: wks-rh1 net: new pid: new @@ -74,7 +74,7 @@ services: - /var/lib/adlin/wks-rh1resolv.conf:/etc/resolv.conf - name: dhcpcd-wks-rh2 - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 hostname: wks-rh2 net: new pid: new @@ -90,7 +90,7 @@ services: - /var/lib/adlin/wks-rh2resolv.conf:/etc/resolv.conf - name: dhcpcd-wks-cm1 - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 hostname: wks-cm1 net: new pid: new @@ -106,7 +106,7 @@ services: - /var/lib/adlin/wks-cm1resolv.conf:/etc/resolv.conf - name: sshd-wks-dg1 - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 net: /run/netns/wks-dg1 uts: /run/utsns/wks-dg1 pid: new @@ -118,7 +118,7 @@ services: - /var/lib/adlin/wks-dg1resolv.conf:/etc/resolv.conf - name: sshd-wks-rh1 - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 net: /run/netns/wks-rh1 uts: /run/utsns/wks-rh1 pid: new