fickit: Update images
This commit is contained in:
parent
a414cd22c8
commit
b7a36f906c
|
|
@ -1,44 +1,45 @@
|
|||
kernel:
|
||||
image: nemunaire/kernel:5.10.62-0b705d955f5e283f62583c4e227d64a7924c138f-amd64
|
||||
#image: nemunaire/kernel:5.10.62-0b705d955f5e283f62583c4e227d64a7924c138f-amd64
|
||||
image: linuxkit/kernel:5.10.104
|
||||
cmdline: "console=ttyS0 console=tty0"
|
||||
|
||||
init:
|
||||
- linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6
|
||||
- linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d
|
||||
- linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866
|
||||
- linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a
|
||||
- linuxkit/getty:ed32c71531f5998aa510847bb07bd847492d4101
|
||||
- linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7
|
||||
- linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4
|
||||
- linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da
|
||||
- linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4
|
||||
- linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
|
||||
- nemunaire/mdadm:3886edd37c79d5f8000e4f3c4bacaff1f6302aa3
|
||||
|
||||
onboot:
|
||||
# - name: mod
|
||||
# image: linuxkit/modprobe:v0.7
|
||||
# image: linuxkit/modprobe:1b59b4f2ebb877085ea0d8d3a41cf06f64c09a15
|
||||
# command: ["/bin/sh", "-c", "modprobe e1000e"]
|
||||
|
||||
- name: sysctl
|
||||
image: linuxkit/sysctl:02d2bd74509fd063857ceb4c4f502f09ee4f2e0a
|
||||
image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae
|
||||
binds:
|
||||
- /etc/sysctl.d/01-fic.conf:/etc/sysctl.d/01-fic.conf:ro
|
||||
|
||||
# Filesystem
|
||||
- name: swap
|
||||
image: linuxkit/swap:0028aeae2741d28120e4d2c6efcc5af003eae395
|
||||
image: linuxkit/swap:77305236719ed7ab4be0f3bccc179c583fe7f5ff
|
||||
command: ["/sbin/swapon", "/dev/md1"]
|
||||
- name: dm-crypt
|
||||
image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb
|
||||
image: linuxkit/dm-crypt:908d3a270650aff7388092a307673c44d86e1ed0
|
||||
command: ["/usr/bin/crypto", "-l", "crypt_fic", "/dev/md0"]
|
||||
- name: mount
|
||||
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
|
||||
image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176
|
||||
command: ["/usr/bin/mountie", "-device", "/dev/mapper/crypt_fic", "/var/lib/fic" ]
|
||||
|
||||
# Network
|
||||
# - name: dhcpcd
|
||||
# image: linuxkit/dhcpcd:v0.7
|
||||
# image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
|
||||
# command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||
# - name: ntp
|
||||
# image: linuxkit/openntpd:536e5947607c9e6a6771957c2ff817230cba0d3c
|
||||
# image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038
|
||||
- name: synchro-ip-setup
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
command: ["/bin/sh", "-c", "ip a add 10.10.10.1/29 dev eth0; ip link set eth0 up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -47,7 +48,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/synchro
|
||||
- name: admin-ip-setup
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
command: ["/bin/sh", "-c", "ip link add link eth1 name adminiface type vlan id 99; ip a add 172.16.99.219/24 dev adminiface; ip link set eth1 up; ip link set adminiface up; ip r add default via 172.16.99.1; ip a add 172.17.0.2/24 dev vethin-admin; ip link set vethin-admin up; ping -W 10 -c 1 172.16.99.1;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -59,7 +60,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/fic-admin
|
||||
- name: backend-ip-setup
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.0.3/24 dev vethin-backend; ip link set vethin-backend up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -70,7 +71,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/fic-backend
|
||||
- name: mysql-ip-setup
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.0.4/24 dev vethin-db; ip link set vethin-db up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -81,7 +82,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/db
|
||||
- name: bridge-setup
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.0.1/24 dev br0; ip link set veth-admin master br0; ip link set veth-backend master br0; ip link set veth-db master br0; ip link set br0 up; ip link set veth-admin up; ip link set veth-backend up; ip link set veth-db up;" ]
|
||||
runtime:
|
||||
interfaces:
|
||||
|
|
@ -89,7 +90,7 @@ onboot:
|
|||
add: bridge
|
||||
|
||||
- name: firewall-synchro
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
command: ["/bin/bash", "-c", "/sbin/iptables-restore < /etc/iptables/rules-synchro.v4; /sbin/ip6tables-restore < /etc/iptables/rules.v6" ]
|
||||
binds:
|
||||
- /etc/iptables/rules-synchro.v4:/etc/iptables/rules-synchro.v4:ro
|
||||
|
|
@ -99,7 +100,7 @@ onboot:
|
|||
mkdir:
|
||||
- /var/lib/fic/teams
|
||||
- name: firewall-admin
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
command: ["/bin/bash", "-c", "/sbin/iptables-restore < /etc/iptables/rules-admin.v4; /sbin/ip6tables-restore < /etc/iptables/rules.v6" ]
|
||||
binds:
|
||||
- /etc/iptables/rules-admin.v4:/etc/iptables/rules-admin.v4:ro
|
||||
|
|
@ -108,15 +109,15 @@ onboot:
|
|||
|
||||
services:
|
||||
# - name: getty
|
||||
# image: linuxkit/getty:v0.7
|
||||
# image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
|
||||
# env:
|
||||
# - INSECURE=true
|
||||
|
||||
# Enable acpi to shutdown on power events
|
||||
- name: acpid
|
||||
image: linuxkit/acpid:d2ddd88c7918466f875e7c5c3e527b51dfb0b0ea
|
||||
image: linuxkit/acpid:c05a368754f6436b326945dc16135ba547568d8d
|
||||
- name: rngd
|
||||
image: linuxkit/rngd:bdabfe138f05f7d48396d2f435af16f5a6ccaa45
|
||||
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
|
||||
- name: db
|
||||
image: mariadb:latest
|
||||
command: ["/bin/bash", "/usr/local/bin/docker-entrypoint.sh", "mysqld"]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
kernel:
|
||||
image: nemunaire/kernel:5.10.62-0b705d955f5e283f62583c4e227d64a7924c138f-amd64
|
||||
#image: nemunaire/kernel:5.10.62-0b705d955f5e283f62583c4e227d64a7924c138f-amd64
|
||||
image: linuxkit/kernel:5.10.104
|
||||
cmdline: "console=ttyS0 console=tty0"
|
||||
|
||||
init:
|
||||
|
|
|
|||
|
|
@ -1,40 +1,41 @@
|
|||
kernel:
|
||||
image: nemunaire/kernel:5.10.62-0b705d955f5e283f62583c4e227d64a7924c138f-amd64
|
||||
#image: nemunaire/kernel:5.10.62-0b705d955f5e283f62583c4e227d64a7924c138f-amd64
|
||||
image: linuxkit/kernel:5.10.104
|
||||
cmdline: "console=ttyS0 console=tty0"
|
||||
|
||||
init:
|
||||
- linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6
|
||||
- linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d
|
||||
- linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866
|
||||
- linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a
|
||||
- linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7
|
||||
- linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4
|
||||
- linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da
|
||||
- linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4
|
||||
- linuxkit/getty:ed32c71531f5998aa510847bb07bd847492d4101
|
||||
- nemunaire/mdadm:3886edd37c79d5f8000e4f3c4bacaff1f6302aa3
|
||||
- nemunaire/fic-frontend-ui:latest
|
||||
|
||||
onboot:
|
||||
# - name: mod
|
||||
# image: linuxkit/modprobe:v0.7
|
||||
# image: linuxkit/modprobe:1b59b4f2ebb877085ea0d8d3a41cf06f64c09a15
|
||||
# command: ["/bin/sh", "-c", "modprobe r8169;"]
|
||||
|
||||
- name: sysctl
|
||||
image: linuxkit/sysctl:02d2bd74509fd063857ceb4c4f502f09ee4f2e0a
|
||||
image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae
|
||||
|
||||
# Filesystem
|
||||
- name: swap
|
||||
image: linuxkit/swap:0028aeae2741d28120e4d2c6efcc5af003eae395
|
||||
image: linuxkit/swap:77305236719ed7ab4be0f3bccc179c583fe7f5ff
|
||||
command: ["/sbin/swapon", "/dev/md1"]
|
||||
- name: dm-crypt
|
||||
image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb
|
||||
image: linuxkit/dm-crypt:908d3a270650aff7388092a307673c44d86e1ed0
|
||||
command: ["/usr/bin/crypto", "-l", "crypt_fic", "/dev/md0"]
|
||||
- name: mount
|
||||
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
|
||||
image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176
|
||||
command: ["/usr/bin/mountie", "-device", "/dev/mapper/crypt_fic", "/var/lib/fic" ]
|
||||
|
||||
# Network
|
||||
# - name: ntp
|
||||
# image: linuxkit/openntpd:536e5947607c9e6a6771957c2ff817230cba0d3c
|
||||
# image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038
|
||||
- name: nginx-ip-setup
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.1.2/24 dev vethin-nginx; ip link set vethin-nginx up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -45,7 +46,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/nginx
|
||||
- name: frontal-ip-setup # without bonding
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
command: ["/bin/sh", "-c", "ip link set eth1 up; ip a add 172.23.42.1/24 dev eth1; ip a add 172.23.42.254/24 dev eth1; ip a add 91.243.117.240/32 dev eth1; ip link add link eth1 name internet type vlan id 2; ip link set internet up;" ]
|
||||
net: /run/netns/nginx
|
||||
runtime:
|
||||
|
|
@ -55,7 +56,7 @@ onboot:
|
|||
# - name: eth3
|
||||
# - name: eth4
|
||||
# - name: frontal-ip-setup # with bonding
|
||||
# image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
# image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
# 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 2; ip link set internet up; sysctl -w net.ipv4.ip_forward=1;" ]
|
||||
# net: /run/netns/nginx
|
||||
# runtime:
|
||||
|
|
@ -67,7 +68,7 @@ onboot:
|
|||
# - name: bond-frontal
|
||||
# add: bond
|
||||
- name: frontend-ip-setup
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.1.3/24 dev vethin-frontend; ip link set vethin-frontend up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -78,7 +79,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/fic-frontend
|
||||
- name: sshd-ip-setup
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
command: ["/bin/sh", "-c", "ip a add 10.10.10.2/29 dev eth0; ip link set eth0 up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -87,7 +88,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/sshd
|
||||
- name: auth-ip-setup
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.1.4/24 dev vethin-auth; ip link set vethin-auth up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -98,7 +99,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/auth
|
||||
- name: bridge-setup
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
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:
|
||||
|
|
@ -106,14 +107,14 @@ onboot:
|
|||
add: bridge
|
||||
|
||||
- name: firewall-frontal
|
||||
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
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:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
|
||||
image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf
|
||||
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
|
||||
|
|
@ -122,17 +123,17 @@ onboot:
|
|||
|
||||
services:
|
||||
# - name: getty
|
||||
# image: linuxkit/getty:v0.7
|
||||
# image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
|
||||
# env:
|
||||
# - INSECURE=true
|
||||
|
||||
# Enable acpi to shutdown on power events
|
||||
- name: acpid
|
||||
image: linuxkit/acpid:d2ddd88c7918466f875e7c5c3e527b51dfb0b0ea
|
||||
image: linuxkit/acpid:c05a368754f6436b326945dc16135ba547568d8d
|
||||
- name: rngd
|
||||
image: linuxkit/rngd:bdabfe138f05f7d48396d2f435af16f5a6ccaa45
|
||||
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
|
||||
- name: dhcpcd
|
||||
image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388
|
||||
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
|
||||
net: /run/netns/nginx
|
||||
binds:
|
||||
- /etc/dhcpcd.conf:/dhcpcd.conf:ro
|
||||
|
|
@ -244,7 +245,7 @@ services:
|
|||
# net: /run/netns/nginx
|
||||
|
||||
- name: dexidp
|
||||
image: ghcr.io/dexidp/dex:v2.30.0
|
||||
image: ghcr.io/dexidp/dex:v2.31.2
|
||||
net: /run/netns/auth
|
||||
binds:
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
|
|
@ -258,7 +259,7 @@ services:
|
|||
mkdir:
|
||||
- /var/lib/fic/dex
|
||||
- name: vouch-proxy
|
||||
image: quay.io/vouch/vouch-proxy:alpine-0.34
|
||||
image: quay.io/vouch/vouch-proxy:alpine-0.37
|
||||
env:
|
||||
- VOUCH_ALLOWALLUSERS=true
|
||||
- VOUCH_COOKIE_DOMAIN=fic.srs.epita.fr
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
kernel:
|
||||
image: nemunaire/kernel:5.10.62-0b705d955f5e283f62583c4e227d64a7924c138f-amd64
|
||||
#image: nemunaire/kernel:5.10.62-0b705d955f5e283f62583c4e227d64a7924c138f-amd64
|
||||
image: linuxkit/kernel:5.10.104
|
||||
cmdline: "console=ttyS0 console=tty0"
|
||||
|
||||
|
||||
init:
|
||||
- nemunaire/mdadm:3886edd37c79d5f8000e4f3c4bacaff1f6302aa3
|
||||
- nemunaire/syslinux:8e4f0f9fbcf77159abd802c3e9894a12f4375871
|
||||
- linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3
|
||||
- linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb
|
||||
- linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918
|
||||
- linuxkit/dm-crypt:908d3a270650aff7388092a307673c44d86e1ed0
|
||||
- alpine:latest
|
||||
|
||||
files:
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
kernel:
|
||||
image: nemunaire/kernel:4.9.210-edfde5a675ea193ae1cadf790b69d67ca1f520c2-dirty-amd64
|
||||
#image: nemunaire/kernel:5.10.62-0b705d955f5e283f62583c4e227d64a7924c138f-amd64
|
||||
image: linuxkit/kernel:5.10.104
|
||||
cmdline: "console=ttyS0 console=tty0"
|
||||
|
||||
|
||||
init:
|
||||
- nemunaire/mdadm:18de5ca414227f38a5c0619662077ba5fa26176d
|
||||
- nemunaire/mdadm:3886edd37c79d5f8000e4f3c4bacaff1f6302aa3
|
||||
- alpine:latest
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue