fic
/
server
2
0
Fork 0
Code Issues Pull Requests 10 Releases Wiki Activity

fickit: Update images

This commit is contained in:
nemunaire 2021-09-04 17:09:40 +02:00
parent 25116cca59
commit dc6d7152f9
4 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fickit-backend.yml
View File

@ -3,12 +3,12 @@ kernel:
cmdline: "console=ttyS0 console=tty0"
init:
- linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626
- linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a
- linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc
- linuxkit/ca-certificates:v0.7
- linuxkit/getty:v0.7
- nemunaire/mdadm:18de5ca414227f38a5c0619662077ba5fa26176d
- linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6
- linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d
- linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866
- linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a
- linuxkit/getty:ed32c71531f5998aa510847bb07bd847492d4101
- nemunaire/mdadm:3886edd37c79d5f8000e4f3c4bacaff1f6302aa3
onboot:
# - name: mod
@ -16,19 +16,19 @@ onboot:
# command: ["/bin/sh", "-c", "modprobe e1000e"]
- name: sysctl
image: linuxkit/sysctl:v0.7
image: linuxkit/sysctl:02d2bd74509fd063857ceb4c4f502f09ee4f2e0a
binds:
- /etc/sysctl.d/01-fic.conf:/etc/sysctl.d/01-fic.conf:ro
# Filesystem
- name: swap
image: linuxkit/swap:v0.7
image: linuxkit/swap:0028aeae2741d28120e4d2c6efcc5af003eae395
command: ["/sbin/swapon", "/dev/md1"]
- name: dm-crypt
image: linuxkit/dm-crypt:v0.7
image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb
command: ["/usr/bin/crypto", "-l", "crypt_fic", "/dev/md0"]
- name: mount
image: linuxkit/mount:v0.7
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "-device", "/dev/mapper/crypt_fic", "/var/lib/fic" ]
# Network
@ -38,7 +38,7 @@ onboot:
# - name: ntp
# image: linuxkit/openntpd:536e5947607c9e6a6771957c2ff817230cba0d3c
- name: synchro-ip-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
command: ["/bin/sh", "-c", "ip a add 10.10.10.1/29 dev eth0; ip link set eth0 up;" ]
net: new
runtime:
@ -47,7 +47,7 @@ onboot:
bindNS:
net: /run/netns/synchro
- name: admin-ip-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
command: ["/bin/sh", "-c", "ip a add 192.168.23.1/24 dev eth1; ip link set eth1 up; ip a add 172.17.0.2/24 dev vethin-admin; ip link set vethin-admin up;" ]
net: new
runtime:
@ -59,7 +59,7 @@ onboot:
bindNS:
net: /run/netns/fic-admin
- name: backend-ip-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
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 +70,7 @@ onboot:
bindNS:
net: /run/netns/fic-backend
- name: mysql-ip-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
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 +81,7 @@ onboot:
bindNS:
net: /run/netns/db
- name: bridge-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
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 +89,7 @@ onboot:
add: bridge
- name: firewall-synchro
image: linuxkit/ip:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
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 +99,7 @@ onboot:
mkdir:
- /var/lib/fic/teams
- name: firewall-admin
image: linuxkit/ip:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
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
@ -114,9 +114,9 @@ services:
# Enable acpi to shutdown on power events
- name: acpid
image: linuxkit/acpid:v0.7
image: linuxkit/acpid:d2ddd88c7918466f875e7c5c3e527b51dfb0b0ea
- name: rngd
image: linuxkit/rngd:v0.7
image: linuxkit/rngd:bdabfe138f05f7d48396d2f435af16f5a6ccaa45
- name: db
image: mariadb:latest
command: ["/bin/bash", "/usr/local/bin/docker-entrypoint.sh", "mysqld"]
@ -142,7 +142,7 @@ services:
mkdir:
- /var/lib/fic/mysql
- name: db-backup
image: nemunaire/mariadb-client:8778512e5dc774e6eb71f566e16a755ddf59bcd8
image: nemunaire/mariadb-client:46433fee4bd61e5486f32260cce1d9bd37372d9b
command: ["/bin/sh", "/root/mysql_backup.sh"]
env:
- MYSQL_HOST=db
@ -221,7 +221,7 @@ services:
- /var/lib/fic/teams
- /var/lib/fic/settings
- name: fic-synchro
image: nemunaire/rsync:cabe4226e500c3bbfb1500635c9faedc086add74
image: nemunaire/rsync:5d1f678641de2197041f4bc4c745e7748bedab02
command: ["/bin/ash", "/root/synchro.sh"]
binds:
- /etc/hosts:/etc/hosts:ro
@ -246,7 +246,7 @@ services:
- /var/lib/fic/teams
- /var/log/frontend
- name: sshd
image: nemunaire/rsync:ca312b09a5048c165cf727660b7755f001d17650
image: nemunaire/rsync:5d1f678641de2197041f4bc4c745e7748bedab02
binds:
- /etc/hosts:/etc/hosts:ro
- /root/.ssh/:/root/.ssh/:ro

2
fickit-boot.yml
View File

@ -3,4 +3,4 @@ kernel:
cmdline: "console=ttyS0 console=tty0"
init:
- nemunaire/boot:f023f1e3750b65e0434fd180f323d5aefe5e9dd1
- nemunaire/boot:f1874f8cd9e7f5f589c448b7a0b46d9e0088747d

74
fickit-frontend.yml
View File

@ -3,12 +3,12 @@ kernel:
cmdline: "console=ttyS0 console=tty0"
init:
- linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626
- linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a
- linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc
- linuxkit/ca-certificates:v0.7
- linuxkit/getty:v0.7
- nemunaire/mdadm:18de5ca414227f38a5c0619662077ba5fa26176d
- linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6
- linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d
- linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866
- linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a
- linuxkit/getty:ed32c71531f5998aa510847bb07bd847492d4101
- nemunaire/mdadm:3886edd37c79d5f8000e4f3c4bacaff1f6302aa3
onboot:
# - name: mod
@ -16,26 +16,26 @@ onboot:
# command: ["/bin/sh", "-c", "modprobe r8169;"]
- name: sysctl
image: linuxkit/sysctl:v0.7
image: linuxkit/sysctl:02d2bd74509fd063857ceb4c4f502f09ee4f2e0a
binds:
- /etc/sysctl.d/01-fic.conf:/etc/sysctl.d/01-fic.conf:ro
# Filesystem
- name: swap
image: linuxkit/swap:v0.7
image: linuxkit/swap:0028aeae2741d28120e4d2c6efcc5af003eae395
command: ["/sbin/swapon", "/dev/md1"]
- name: dm-crypt
image: linuxkit/dm-crypt:v0.7
image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb
command: ["/usr/bin/crypto", "-l", "crypt_fic", "/dev/md0"]
- name: mount
image: linuxkit/mount:v0.7
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "-device", "/dev/mapper/crypt_fic", "/var/lib/fic" ]
# Network
# - name: ntp
# image: linuxkit/openntpd:536e5947607c9e6a6771957c2ff817230cba0d3c
- name: nginx-ip-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
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,9 +45,19 @@ onboot:
peer: veth-nginx
bindNS:
net: /run/netns/nginx
# - name: frontal-ip-setup # without bonding
# image: linuxkit/ip:v0.7
# 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 163.5.55.58/32 dev eth1; ip link add link eth1 name internet type vlan id 2; ip link set internet up;" ]
- name: frontal-ip-setup # without bonding
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
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 163.5.55.58/32 dev eth1; ip link add link eth1 name internet type vlan id 2; ip link set internet up;" ]
net: /run/netns/nginx
runtime:
interfaces:
- name: eth1
# - name: eth2
# - name: eth3
# - name: eth4
# - name: frontal-ip-setup # with bonding
# image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
# 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 163.5.55.58/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:
# interfaces:
@ -55,20 +65,10 @@ onboot:
# - name: eth2
# - name: eth3
# - name: eth4
- name: frontal-ip-setup # with bonding
image: linuxkit/ip:v0.7
command: ["/bin/sh", "-c", "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 163.5.55.58/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:
interfaces:
- name: eth1
- name: eth2
- name: eth3
- name: eth4
- name: bond-frontal
add: bond
# - name: bond-frontal
# add: bond
- name: frontend-ip-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
command: ["/bin/sh", "-c", "ip a add 172.17.1.3/24 dev vethin-frontend; ip link set vethin-frontend up;" ]
net: new
runtime:
@ -79,7 +79,7 @@ onboot:
bindNS:
net: /run/netns/fic-frontend
- name: sshd-ip-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
command: ["/bin/sh", "-c", "ip a add 10.10.10.2/29 dev eth0; ip link set eth0 up;" ]
net: new
runtime:
@ -88,7 +88,7 @@ onboot:
bindNS:
net: /run/netns/sshd
- name: bridge-setup
image: linuxkit/ip:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
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 br0 up; ip link set veth-nginx up; ip link set veth-frontend up;" ]
runtime:
interfaces:
@ -96,14 +96,14 @@ onboot:
add: bridge
- name: firewall-frontal
image: linuxkit/ip:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
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:v0.7
image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1
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
@ -118,11 +118,11 @@ services:
# Enable acpi to shutdown on power events
- name: acpid
image: linuxkit/acpid:v0.7
image: linuxkit/acpid:d2ddd88c7918466f875e7c5c3e527b51dfb0b0ea
- name: rngd
image: linuxkit/rngd:v0.7
image: linuxkit/rngd:bdabfe138f05f7d48396d2f435af16f5a6ccaa45
- name: dhcpcd
image: linuxkit/dhcpcd:v0.7
image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388
net: /run/netns/nginx
binds:
- /etc/dhcpcd.conf:/dhcpcd.conf:ro
@ -180,7 +180,7 @@ services:
- /var/lib/fic/submissions
- /var/lib/fic/teams
- name: sshd
image: nemunaire/rsync:ca312b09a5048c165cf727660b7755f001d17650
image: nemunaire/rsync:5d1f678641de2197041f4bc4c745e7748bedab02
capabilities:
- all
binds:
@ -216,7 +216,7 @@ services:
ipc: new
uts: new
- name: dns-server
image: nemunaire/unbound:761b47b640c50d7eff2b6381ee9248957c4d1c3c
image: nemunaire/unbound:a7c841a408e5e3cc27b920cd70c806093f04687c
binds:
- /etc/unbound/unbound.d:/etc/unbound/unbound.d:ro
net: /run/netns/nginx
@ -227,7 +227,7 @@ files:
source: configs/sshd-setup.sh
mode: "0555"
- path: etc/sysctl.d/01-fic.conf
- path: /containers/onboot/000-sysctl/rootfs/etc/sysctl.d/01-fic.conf
source: configs/sysctl-frontend.conf
mode: "0444"

12
fickit-prepare.yml
View File

@ -4,10 +4,10 @@ kernel:
init:
- nemunaire/mdadm:18de5ca414227f38a5c0619662077ba5fa26176d
- nemunaire/syslinux:4e080937962e68f9f6a962ff6890cb4c62720841
- linuxkit/format:v0.7
- linuxkit/dm-crypt:v0.7
- nemunaire/mdadm:3886edd37c79d5f8000e4f3c4bacaff1f6302aa3
- nemunaire/syslinux:8e4f0f9fbcf77159abd802c3e9894a12f4375871
- linuxkit/format:fdad8c50d594712537f94862dab3d955cbb48fc3
- linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb
- alpine:latest
files:
@ -40,8 +40,8 @@ files:
cat /etc/fdisk_cmd | fdisk /dev/sda &&
cat /etc/fdisk_cmd | fdisk /dev/sdb &&
cat /etc/sfdisk_schema | sfdisk /dev/sda &&
cat /etc/sfdisk_schema | sfdisk /dev/sdb
cat /etc/sfdisk_schema | sfdisk --force /dev/sda &&
cat /etc/sfdisk_schema | sfdisk --force /dev/sdb
/sbin/mdadm --create /dev/md2 --run --level=1 --metadata=1.0 --raid-devices=2 /dev/sda1 /dev/sdb1
/sbin/mdadm --create /dev/md1 --run --level=1 --metadata=1.1 --raid-devices=2 /dev/sda2 /dev/sdb2