fickit: Update linuxkit images
This commit is contained in:
parent
d17e0d17a9
commit
7de41b78a7
3 changed files with 53 additions and 51 deletions
|
|
@ -4,39 +4,39 @@ kernel:
|
|||
cmdline: "console=ttyS0 console=tty0"
|
||||
|
||||
init:
|
||||
- linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7
|
||||
- linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4
|
||||
- linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da
|
||||
- linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4
|
||||
- linuxkit/getty:ed32c71531f5998aa510847bb07bd847492d4101
|
||||
- linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5
|
||||
- linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e
|
||||
- linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718
|
||||
- linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32
|
||||
- linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437
|
||||
- nemunaire/mdadm:3886edd37c79d5f8000e4f3c4bacaff1f6302aa3
|
||||
- nemunaire/kexec:db743618d3674729088d64b5d303e4b7d7ff148b
|
||||
- nemunaire/fic-frontend-ui:latest@sha256:027da8fdea78106bee6be87fc1b0874504f8b4092593e874ca767bcc47c79ddc
|
||||
|
||||
onboot:
|
||||
- name: mod
|
||||
image: linuxkit/modprobe:1b59b4f2ebb877085ea0d8d3a41cf06f64c09a15
|
||||
image: linuxkit/modprobe:5dd4d7238f760bcd9f91b9166f414da953242f43
|
||||
command: ["/bin/sh", "-c", "modprobe xhci_pci ahci intel_lpss_pci i2c_i801 megaraid_sas tg3 bnxt_en"]
|
||||
|
||||
- name: sysctl
|
||||
image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae
|
||||
image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799
|
||||
|
||||
# Filesystem
|
||||
- name: swap
|
||||
image: linuxkit/swap:77305236719ed7ab4be0f3bccc179c583fe7f5ff
|
||||
image: linuxkit/swap:d17a7f1c26ff768c26b3c206ccf3aa72349568df
|
||||
command: ["/sbin/swapon", "/dev/sda2"]
|
||||
- name: dm-crypt
|
||||
image: linuxkit/dm-crypt:908d3a270650aff7388092a307673c44d86e1ed0
|
||||
image: linuxkit/dm-crypt:526d32351c8246431be8e1a168cb514ff3c365af
|
||||
command: ["/usr/bin/crypto", "-l", "crypt_fic", "/dev/sda3"]
|
||||
- name: mount
|
||||
image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176
|
||||
image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257
|
||||
command: ["/usr/bin/mountie", "-device", "/dev/mapper/crypt_fic", "/var/lib/fic" ]
|
||||
|
||||
# Network
|
||||
# - name: ntp
|
||||
# image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038
|
||||
# image: linuxkit/openntpd:dd353cac6cbd816008c565041cec6650090d0ad0
|
||||
- name: nginx-ip-setup
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.1.2/24 dev vethin-nginx; ip link set vethin-nginx up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -47,7 +47,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/nginx
|
||||
- name: frontal-ip-setup # without bonding
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||
command: ["/bin/sh", "-c", "ip link set name bond-frontal eth3; ip link set bond-frontal up; ip a add 192.168.50.10/24 dev bond-frontal; ip a add 91.243.117.240/32 dev bond-frontal; ip r add default via 192.168.50.1; ip link add link bond-frontal name internet type vlan id 4; ip link set internet up;" ]
|
||||
net: /run/netns/nginx
|
||||
runtime:
|
||||
|
|
@ -57,7 +57,7 @@ onboot:
|
|||
- name: eth3
|
||||
# - name: eth4
|
||||
# - name: frontal-ip-setup # with bonding
|
||||
# image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
# image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||
# command: ["/bin/sh", "-c", "ip link set dev bond-frontal type bond mode balance-alb; ip link set bond-frontal up; ifenslave bond-frontal eth1 eth2 eth3 eth4; ip a add 172.23.42.254/24 dev bond-frontal; ip a add 172.23.42.1/24 dev bond-frontal; ip a add 91.243.117.240/32 dev bond-frontal; ip link add link bond-frontal name internet type vlan id 4; ip link set internet up; sysctl -w net.ipv4.ip_forward=1;" ]
|
||||
# net: /run/netns/nginx
|
||||
# runtime:
|
||||
|
|
@ -69,7 +69,7 @@ onboot:
|
|||
# - name: bond-frontal
|
||||
# add: bond
|
||||
- name: frontend-ip-setup
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.1.3/24 dev vethin-frontend; ip link set vethin-frontend up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -80,7 +80,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/fic-frontend
|
||||
- name: sshd-ip-setup
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||
command: ["/bin/sh", "-c", "ip a add 10.10.10.2/29 dev eth2; ip link set eth2 up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -89,7 +89,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/sshd
|
||||
- name: auth-ip-setup
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.1.4/24 dev vethin-auth; ip link set vethin-auth up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -100,7 +100,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/auth
|
||||
- name: bridge-setup
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.1.1/24 dev br0; ip link set veth-nginx master br0; ip link set veth-frontend master br0; ip link set veth-auth master br0; ip link set br0 up; ip link set veth-nginx up; ip link set veth-frontend up; ip link set veth-auth up;" ]
|
||||
runtime:
|
||||
interfaces:
|
||||
|
|
@ -108,14 +108,14 @@ onboot:
|
|||
add: bridge
|
||||
|
||||
- name: firewall-frontal
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||
command: ["/bin/bash", "-c", "/sbin/iptables-restore < /etc/iptables/rules-frontal.v4; /sbin/ip6tables-restore < /etc/iptables/rules.v6" ]
|
||||
binds:
|
||||
- /etc/iptables/rules-frontal.v4:/etc/iptables/rules-frontal.v4:ro
|
||||
- /etc/iptables/rules.v6:/etc/iptables/rules.v6:ro
|
||||
net: /run/netns/nginx
|
||||
- name: firewall-sshd
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||
command: ["/bin/bash", "-c", "/sbin/iptables-restore < /etc/iptables/rules-sshd.v4; /sbin/ip6tables-restore < /etc/iptables/rules.v6" ]
|
||||
binds:
|
||||
- /etc/iptables/rules-sshd.v4:/etc/iptables/rules-sshd.v4:ro
|
||||
|
|
@ -124,17 +124,17 @@ onboot:
|
|||
|
||||
services:
|
||||
# - name: getty
|
||||
# image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
|
||||
# image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437
|
||||
# env:
|
||||
# - INSECURE=true
|
||||
|
||||
# Enable acpi to shutdown on power events
|
||||
- name: acpid
|
||||
image: linuxkit/acpid:c05a368754f6436b326945dc16135ba547568d8d
|
||||
image: linuxkit/acpid:548f8f1c8bda31cdbefb65bdb0747f97c17639d2
|
||||
- name: rngd
|
||||
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
|
||||
image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4
|
||||
- name: dhcpcd
|
||||
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
|
||||
image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115
|
||||
net: /run/netns/nginx
|
||||
binds:
|
||||
- /etc/dhcpcd.conf:/dhcpcd.conf:ro
|
||||
|
|
@ -191,7 +191,9 @@ services:
|
|||
- /var/lib/fic/submissions
|
||||
- /var/lib/fic/teams
|
||||
- name: fic-remote-challenge-sync-airbus
|
||||
image: nemunaire/fic-remote-challenge-sync-airbus:latest
|
||||
# image: nemunaire/fic-remote-challenge-sync-airbus:latest
|
||||
image: alpine:latest
|
||||
command: ["/bin/ash", "-c", "while true; do sleep 300; done"]
|
||||
env:
|
||||
- AIRBUS_BASEURL=https://....
|
||||
- AIRBUS_TOKEN=abcdef0123456789abcdef0123456789
|
||||
|
|
@ -247,7 +249,7 @@ services:
|
|||
# net: /run/netns/nginx
|
||||
|
||||
- name: dexidp
|
||||
image: ghcr.io/dexidp/dex:v2.31.2
|
||||
image: ghcr.io/dexidp/dex:v2.36.0
|
||||
net: /run/netns/auth
|
||||
binds:
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
|
|
@ -261,7 +263,7 @@ services:
|
|||
mkdir:
|
||||
- /var/lib/fic/dex
|
||||
- name: vouch-proxy
|
||||
image: quay.io/vouch/vouch-proxy:alpine-0.37
|
||||
image: quay.io/vouch/vouch-proxy:alpine-0.39
|
||||
env:
|
||||
- VOUCH_ALLOWALLUSERS=true
|
||||
- VOUCH_COOKIE_DOMAIN=fic.srs.epita.fr
|
||||
|
|
|
|||
Reference in a new issue