diff --git a/configs/update_imgs.sh b/configs/update_imgs.sh index 7768d6dd..420205f2 100644 --- a/configs/update_imgs.sh +++ b/configs/update_imgs.sh @@ -3,7 +3,7 @@ mkdir -p /boot/imgs # Backup the previous metadata -/usr/bin/metadata -v +/usr/bin/metadata -v cdrom mv /boot/imgs/fickit-metadata.iso /boot/imgs/fickit-metadata.iso.bak for img in fickit-boot-kernel fickit-metadata.iso fickit-boot-initrd.img fickit-prepare-initrd.img fickit-frontend-squashfs.img fickit-backend-squashfs.img fickit-update-initrd.img diff --git a/fickit-backend.yml b/fickit-backend.yml index c7a34444..1cf898d3 100644 --- a/fickit-backend.yml +++ b/fickit-backend.yml @@ -4,32 +4,32 @@ kernel: cmdline: "console=ttyS0 console=tty0" init: - - linuxkit/init:45a1ad5919f0b6acf0f0cf730e9434abfae11fe6 + - linuxkit/init:v1.0.0 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad - - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff - - linuxkit/getty:5d86a2ce2d890c14ab66b13638dcadf74f29218b + - linuxkit/containerd:v1.0.0 + - linuxkit/ca-certificates:v1.0.0 + - linuxkit/getty:v1.0.0 - nemunaire/mdadm:04814350d71ba9417e1f861be1685de26adf7a67 - nemunaire/kexec:839b4eedfce02a56c581dec2383dc6faff120855 onboot: - name: mod - image: linuxkit/modprobe:ab5ac4d5e7e7a5f2d103764850f7846b69230676 + image: linuxkit/modprobe:v1.0.0 command: ["/bin/sh", "-c", "modprobe xhci_pci ahci intel_lpss_pci i2c_i801 megaraid_sas tg3 bnxt_en"] - name: sysctl - image: linuxkit/sysctl:5a374e4bf3e5a7deeacff6571d0f30f7ea8f56db + image: linuxkit/sysctl:v1.0.0 binds: - /etc/sysctl.d/01-fic.conf:/etc/sysctl.d/01-fic.conf:ro # Metadata - name: metadata - image: linuxkit/metadata:b082f1bf97a9034d1e4c0e36a5d2923f4e58f540 - command: ["/usr/bin/metadata", "-v"] + image: linuxkit/metadata:v1.0.0 + command: ["/usr/bin/metadata", "-v", "cdrom"] # Filesystem - name: swap - image: linuxkit/swap:c57f3319ce770515357f0058035e40519c22b752 + image: linuxkit/swap:v1.0.0 command: ["/sbin/swapon", "/dev/sda3"] - name: dm-crypt image: linuxkit/dm-crypt:d49723bc9d10c5ada9e03b0670f4e57416d5d084 @@ -38,17 +38,17 @@ onboot: - /dev:/dev - /run/config/dm-crypt:/etc/dm-crypt - name: mount - image: linuxkit/mount:19ff89c251a4156bda8ed11c95faad2f40eb770e + image: linuxkit/mount:v1.0.0 command: ["/usr/bin/mountie", "-device", "/dev/mapper/crypt_fic", "/var/lib/fic" ] # Network # - name: dhcpcd -# image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 +# image: linuxkit/dhcpcd:v1.0.0 # command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] # - name: ntp -# image: linuxkit/openntpd:dd353cac6cbd816008c565041cec6650090d0ad0 +# image: linuxkit/openntpd:v1.0.0 - name: synchro-ip-setup - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 command: ["/bin/sh", "-c", "ip a add 10.10.10.1/29 dev eth2; ip link set eth2 up;" ] net: new runtime: @@ -57,7 +57,7 @@ onboot: bindNS: net: /run/netns/synchro - name: qa-ip-setup - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 command: ["/bin/sh", "-c", "ip link show eth1 2> /dev/null && { ip a add 10.10.10.1/29 dev eth1; ip link set eth1 up; }; ip a add 172.17.0.6/24 dev vethin-qa; ip link set vethin-qa up" ] net: new runtime: @@ -69,7 +69,7 @@ onboot: bindNS: net: /run/netns/fic-qa - name: admin-ip-setup - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 #command: ["/bin/sh", "-c", "ip link add link eth3 name adminiface type vlan id 99; ip a add 172.16.99.219/24 dev adminiface; ip link set eth3 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;" ] command: ["/bin/sh", "-c", "ip link set eth3 up; while read IP; do ip a add ${IP} dev eth3; done < /run/config/ip_config/backend-admin; ip r add default via $(cat /run/config/ip_config/backend-router); ip a add 172.17.0.2/24 dev vethin-admin; ip link set vethin-admin up; ping -W 10 -c 1 $(cat /run/config/ip_config/backend-router); ip link show eth1 2> /dev/null && { ip a add 10.0.0.1/24 dev eth1; ip link set eth1 up; };" ] net: new @@ -85,7 +85,7 @@ onboot: bindNS: net: /run/netns/fic-admin - name: checker-ip-setup - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 command: ["/bin/sh", "-c", "ip a add 172.17.0.3/24 dev vethin-checker; ip link set vethin-checker up;" ] net: new runtime: @@ -96,7 +96,7 @@ onboot: bindNS: net: /run/netns/fic-checker - name: generator-ip-setup - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 command: ["/bin/sh", "-c", "ip a add 172.17.0.5/24 dev vethin-generat; ip link set vethin-generat up;" ] net: new runtime: @@ -107,7 +107,7 @@ onboot: bindNS: net: /run/netns/fic-generator - name: mysql-ip-setup - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 command: ["/bin/sh", "-c", "ip a add 172.17.0.4/24 dev vethin-db; ip link set vethin-db up;" ] net: new runtime: @@ -118,7 +118,7 @@ onboot: bindNS: net: /run/netns/db - name: bridge-setup - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 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-checker master br0; ip link set veth-generator master br0; ip link set veth-db master br0; ip link set veth-qa master br0; ip link set br0 up; ip link set veth-admin up; ip link set veth-checker up; ip link set veth-generator up; ip link set veth-db up; ip link set veth-qa up;" ] runtime: interfaces: @@ -126,7 +126,7 @@ onboot: add: bridge - name: firewall-synchro - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 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 @@ -136,7 +136,7 @@ onboot: mkdir: - /var/lib/fic/teams - name: firewall-admin - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 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 @@ -155,15 +155,15 @@ onboot: services: # - name: getty -# image: linuxkit/getty:5d86a2ce2d890c14ab66b13638dcadf74f29218b +# image: linuxkit/getty:v1.0.0 # env: # - INSECURE=true # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:3b1560c81d3884e049ebbd9d9bf94ccb394e6cd3 + image: linuxkit/acpid:v1.0.0 - name: rngd - image: linuxkit/rngd:cdb919e4aee49fed0bf6075f0a104037cba83c39 + image: linuxkit/rngd:v1.0.0 - name: db image: mariadb:11 command: ["/bin/bash", "/usr/local/bin/docker-entrypoint.sh", "mariadbd"] diff --git a/fickit-frontend.yml b/fickit-frontend.yml index 0821f12f..7b2d4002 100644 --- a/fickit-frontend.yml +++ b/fickit-frontend.yml @@ -4,31 +4,31 @@ kernel: cmdline: "console=ttyS0 console=tty0" init: - - linuxkit/init:45a1ad5919f0b6acf0f0cf730e9434abfae11fe6 + - linuxkit/init:v1.0.0 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad - - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff - - linuxkit/getty:5d86a2ce2d890c14ab66b13638dcadf74f29218b + - linuxkit/containerd:v1.0.0 + - linuxkit/ca-certificates:v1.0.0 + - linuxkit/getty:v1.0.0 - nemunaire/mdadm:04814350d71ba9417e1f861be1685de26adf7a67 - nemunaire/kexec:839b4eedfce02a56c581dec2383dc6faff120855 - nemunaire/fic-frontend-ui:latest onboot: - name: mod - image: linuxkit/modprobe:ab5ac4d5e7e7a5f2d103764850f7846b69230676 + image: linuxkit/modprobe:v1.0.0 command: ["/bin/sh", "-c", "modprobe xhci_pci ahci intel_lpss_pci i2c_i801 megaraid_sas tg3 bnxt_en"] - name: sysctl - image: linuxkit/sysctl:5a374e4bf3e5a7deeacff6571d0f30f7ea8f56db + image: linuxkit/sysctl:v1.0.0 # Metadata - name: metadata - image: linuxkit/metadata:b082f1bf97a9034d1e4c0e36a5d2923f4e58f540 - command: ["/usr/bin/metadata", "-v"] + image: linuxkit/metadata:v1.0.0 + command: ["/usr/bin/metadata", "-v", "cdrom"] # Filesystem - name: swap - image: linuxkit/swap:c57f3319ce770515357f0058035e40519c22b752 + image: linuxkit/swap:v1.0.0 command: ["/sbin/swapon", "/dev/sda3"] - name: dm-crypt image: linuxkit/dm-crypt:d49723bc9d10c5ada9e03b0670f4e57416d5d084 @@ -37,14 +37,14 @@ onboot: - /dev:/dev - /run/config/dm-crypt:/etc/dm-crypt - name: mount - image: linuxkit/mount:19ff89c251a4156bda8ed11c95faad2f40eb770e + image: linuxkit/mount:v1.0.0 command: ["/usr/bin/mountie", "-device", "/dev/mapper/crypt_fic", "/var/lib/fic" ] # Network # - name: ntp -# image: linuxkit/openntpd:dd353cac6cbd816008c565041cec6650090d0ad0 +# image: linuxkit/openntpd:v1.0.0 - name: nginx-ip-setup - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 command: ["/bin/sh", "-c", "ip a add 172.17.1.2/24 dev vethin-nginx; ip link set vethin-nginx up;" ] net: new runtime: @@ -55,7 +55,7 @@ onboot: bindNS: net: /run/netns/nginx - name: frontal-ip-setup # without bonding - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 command: ["/bin/sh", "-c", "ip link set name bond-frontal eth3; ip link set bond-frontal up; while read IP; do ip a add ${IP} dev bond-frontal; done < /run/config/ip_config/frontend-players; ip r add default via $(cat /run/config/ip_config/frontend-router); ip link add link bond-frontal name internet type vlan id 4; ip a add 10.10.10.2/29 dev internet; ip link set internet up;" ] net: /run/netns/nginx binds: @@ -67,7 +67,7 @@ onboot: - name: eth3 # - name: eth4 # - name: frontal-ip-setup # with bonding -# image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 +# image: linuxkit/ip:v1.0.0 # 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; while read IP; do ip a add ${IP} dev bond-frontal; done < /run/config/ip_config/frontend-players; ip r add default via $(cat /run/config/ip_config/frontend-router); 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 # binds: @@ -81,7 +81,7 @@ onboot: # - name: bond-frontal # add: bond - name: receiver-ip-setup - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 command: ["/bin/sh", "-c", "ip a add 172.17.1.3/24 dev vethin-receiver; ip link set vethin-receiver up;" ] net: new runtime: @@ -92,7 +92,7 @@ onboot: bindNS: net: /run/netns/fic-receiver - name: sshd-ip-setup - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 command: ["/bin/sh", "-c", "ip a add 10.10.10.2/29 dev eth2; ip link set eth2 up;" ] net: new runtime: @@ -101,7 +101,7 @@ onboot: bindNS: net: /run/netns/sshd - name: auth-ip-setup - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 command: ["/bin/sh", "-c", "ip a add 172.17.1.4/24 dev vethin-auth; ip link set vethin-auth up;" ] net: new runtime: @@ -112,7 +112,7 @@ onboot: bindNS: net: /run/netns/auth - name: bridge-setup - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 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-receiver master br0; ip link set veth-auth master br0; ip link set br0 up; ip link set veth-nginx up; ip link set veth-receiver up; ip link set veth-auth up;" ] runtime: interfaces: @@ -120,14 +120,14 @@ onboot: add: bridge - name: firewall-frontal - image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 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:bb250017b05de5e16ac436b1eb19a39c87b5a252 + image: linuxkit/ip:v1.0.0 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 @@ -136,17 +136,17 @@ onboot: services: # - name: getty -# image: linuxkit/getty:5d86a2ce2d890c14ab66b13638dcadf74f29218b +# image: linuxkit/getty:v1.0.0 # env: # - INSECURE=true # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:3b1560c81d3884e049ebbd9d9bf94ccb394e6cd3 + image: linuxkit/acpid:v1.0.0 - name: rngd - image: linuxkit/rngd:cdb919e4aee49fed0bf6075f0a104037cba83c39 + image: linuxkit/rngd:v1.0.0 - name: dhcpcd - image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee + image: linuxkit/dhcpcd:v1.0.0 net: /run/netns/nginx binds: - /etc/dhcpcd.conf:/dhcpcd.conf:ro diff --git a/fickit-prepare.yml b/fickit-prepare.yml index 48ad05be..e93be27b 100644 --- a/fickit-prepare.yml +++ b/fickit-prepare.yml @@ -5,11 +5,11 @@ kernel: init: - - nemunaire/mdadm:8c8a476336087b395878e02e1d89008da6a38044 + - nemunaire/mdadm:04814350d71ba9417e1f861be1685de26adf7a67 - nemunaire/syslinux:086f221f281d577d300949aa1094fb20c5cd90dc - - linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e - - linuxkit/dm-crypt:526d32351c8246431be8e1a168cb514ff3c365af - - linuxkit/metadata:501144d47215671e77b9cac44748a04f21236195 + - linuxkit/format:v1.0.0 + - linuxkit/dm-crypt:d49723bc9d10c5ada9e03b0670f4e57416d5d084 + - linuxkit/metadata:v1.0.0 - alpine:latest files: diff --git a/fickit-update.yml b/fickit-update.yml index c1766300..bcf595cd 100644 --- a/fickit-update.yml +++ b/fickit-update.yml @@ -5,8 +5,8 @@ kernel: init: - - nemunaire/mdadm:8c8a476336087b395878e02e1d89008da6a38044 - - linuxkit/metadata:b082f1bf97a9034d1e4c0e36a5d2923f4e58f540 + - nemunaire/mdadm:04814350d71ba9417e1f861be1685de26adf7a67 + - linuxkit/metadata:v1.0.0 - alpine:latest