Update fickit
This commit is contained in:
parent
a499d23149
commit
20df137eeb
12 changed files with 514 additions and 98 deletions
|
|
@ -1,26 +1,30 @@
|
|||
kernel:
|
||||
image: nemunaire/kernel:4.9.77
|
||||
cmdline: "console=tty0"
|
||||
image: nemunaire/kernel:4.9.140-4080ab71159a0b09a0b2ce7d87a7cb7fd719e35d-dirty-amd64
|
||||
cmdline: "console=ttyS0 console=tty0"
|
||||
|
||||
init:
|
||||
- linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9
|
||||
- linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff
|
||||
- linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a
|
||||
- linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
|
||||
- linuxkit/getty:22e27189b6b354e1d5d38fc0536a5af3f2adb79f
|
||||
- nemunaire/mdadm:0ac2a0d3e7be84f1aad852c906d54cbff4d1668f
|
||||
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
|
||||
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
|
||||
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
|
||||
- linuxkit/ca-certificates:v0.6
|
||||
- linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478
|
||||
- nemunaire/mdadm:18541ef20acd7e67e07bb2bde4f378239e67c42d
|
||||
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: linuxkit/sysctl:4c1ef93bb5eb1a877318db4b2daa6768ed002e21
|
||||
- name: mod
|
||||
image: linuxkit/modprobe:v0.6
|
||||
command: ["/bin/sh", "-c", "modprobe r8169;"]
|
||||
|
||||
# - name: sysctl
|
||||
# image: linuxkit/sysctl:v0.6
|
||||
|
||||
# Filesystem
|
||||
- name: swap
|
||||
image: linuxkit/swap:b3d5db11b14168874a01b5ea4398186321be836f
|
||||
command: ["/sbin/swapon", "/dev/sda3", "/dev/sdb3"]
|
||||
image: linuxkit/swap:v0.6
|
||||
command: ["/sbin/swapon", "/dev/sda2", "/dev/sdb2"]
|
||||
- name: mount
|
||||
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||
command: ["/usr/bin/mountie", "-device", "/dev/md127", "/var/lib/fic" ]
|
||||
image: linuxkit/mount:v0.6
|
||||
command: ["/usr/bin/mountie", "-device", "/dev/md0", "/var/lib/fic" ]
|
||||
|
||||
# Network
|
||||
# - name: dhcpcd
|
||||
|
|
@ -29,7 +33,7 @@ onboot:
|
|||
# - name: ntp
|
||||
# image: linuxkit/openntpd:536e5947607c9e6a6771957c2ff817230cba0d3c
|
||||
- name: nginx-ip-setup
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
image: linuxkit/ip:v0.6
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.1.2/24 dev vethin-nginx; ip link set vethin-nginx up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -39,19 +43,28 @@ onboot:
|
|||
peer: veth-nginx
|
||||
bindNS:
|
||||
net: /run/netns/nginx
|
||||
- name: frontal-ip-setup
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
command: ["/bin/sh", "-c", "ip link set bond-frontal up; ifenslave bond-frontal eth1 eth2 eth3; ip a add 172.23.42.1/24 dev bond-frontal; ip a add 163.5.55.58/32 dev bond-frontal;" ]
|
||||
- name: frontal-ip-setup # without bonding
|
||||
image: linuxkit/ip:v0.6
|
||||
command: ["/bin/sh", "-c", "ip link set eth1 up; ip a add 172.23.42.1/24 dev eth1; ip a add 163.5.55.58/32 dev eth1;" ]
|
||||
net: /run/netns/nginx
|
||||
runtime:
|
||||
interfaces:
|
||||
- name: eth1
|
||||
- name: eth2
|
||||
- name: eth3
|
||||
- name: bond-frontal
|
||||
add: bond
|
||||
# - name: frontal-ip-setup # with bonding
|
||||
# image: linuxkit/ip:v0.6
|
||||
# command: ["/bin/sh", "-c", "ip link set bond-frontal up; ifenslave bond-frontal eth1 eth2 eth3; ip a add 172.23.42.1/24 dev bond-frontal; ip a add 163.5.55.58/32 dev bond-frontal;" ]
|
||||
# net: /run/netns/nginx
|
||||
# runtime:
|
||||
# interfaces:
|
||||
# - name: eth1
|
||||
# - name: eth2
|
||||
# - name: eth3
|
||||
# - name: bond-frontal
|
||||
# add: bond
|
||||
- name: frontend-ip-setup
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
image: linuxkit/ip:v0.6
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.1.3/24 dev vethin-frontend; ip link set vethin-frontend up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -62,7 +75,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/fic-frontend
|
||||
- name: sshd-ip-setup
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
image: linuxkit/ip:v0.6
|
||||
command: ["/bin/sh", "-c", "ip a add 10.10.10.2/29 dev eth0; ip link set eth0 up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -71,7 +84,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/sshd
|
||||
- name: bridge-setup
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
image: linuxkit/ip:v0.6
|
||||
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:
|
||||
|
|
@ -79,14 +92,14 @@ onboot:
|
|||
add: bridge
|
||||
|
||||
- name: firewall-frontal
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
image: linuxkit/ip:v0.6
|
||||
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:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
image: linuxkit/ip:v0.6
|
||||
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
|
||||
|
|
@ -94,8 +107,12 @@ onboot:
|
|||
net: /run/netns/sshd
|
||||
|
||||
services:
|
||||
# - name: getty
|
||||
# image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478
|
||||
# env:
|
||||
# - INSECURE=true
|
||||
- name: rngd
|
||||
image: linuxkit/rngd:94e01a4b16fadb053455cdc2269c4eb0b39199cd
|
||||
image: linuxkit/rngd:v0.6
|
||||
- name: nginx
|
||||
image: nginx:alpine
|
||||
capabilities:
|
||||
|
|
@ -145,7 +162,7 @@ services:
|
|||
- /var/lib/fic/submissions
|
||||
- /var/lib/fic/teams
|
||||
- name: sshd
|
||||
image: nemunaire/rsync:f66273f042b8a2976fe4af2425943df913b18088
|
||||
image: nemunaire/rsync:416df0e1fe1562d5d1c63461dacd1267b47a4f05
|
||||
binds:
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
- /root/.ssh/id_synchro.pub:/root/.ssh/authorized_keys:ro
|
||||
|
|
@ -178,16 +195,16 @@ services:
|
|||
pid: new
|
||||
ipc: new
|
||||
uts: new
|
||||
- name: dns-server
|
||||
image: sapcc/unbound
|
||||
binds:
|
||||
- /etc/unbound/unbound.conf:/etc/unbound/unbound.conf:ro
|
||||
capabilities:
|
||||
- CAP_NET_BIND_SERVICE
|
||||
net: /run/netns/nginx
|
||||
pid: new
|
||||
ipc: new
|
||||
uts: new
|
||||
# - name: dns-server
|
||||
# image: sapcc/unbound
|
||||
# binds:
|
||||
# - /etc/unbound/unbound.conf:/etc/unbound/unbound.conf:ro
|
||||
# capabilities:
|
||||
# - CAP_NET_BIND_SERVICE
|
||||
# net: /run/netns/nginx
|
||||
# pid: new
|
||||
# ipc: new
|
||||
# uts: new
|
||||
|
||||
|
||||
files:
|
||||
|
|
@ -215,10 +232,10 @@ files:
|
|||
source: configs/dhcpd.conf
|
||||
mode: "0400"
|
||||
- path: etc/nginx/conf.d/default.conf
|
||||
source: configs/nginx-prod.conf
|
||||
source: configs/nginx-demo.conf
|
||||
mode: "0400"
|
||||
- path: etc/nginx/fic-auth.conf
|
||||
source: configs/fic-auth.conf
|
||||
source: configs/fic-auth-demo.conf
|
||||
mode: "0400"
|
||||
|
||||
- path: www/htdocs-frontend
|
||||
|
|
@ -227,20 +244,20 @@ files:
|
|||
- path: www/htdocs-frontend/e500.html
|
||||
source: frontend/static/e500.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/e500.json
|
||||
source: frontend/static/e500.json
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/img/srs.png
|
||||
source: frontend/static/img/srs.png
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/img/fic.png
|
||||
source: frontend/static/img/fic.png
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/img/logo-epita-bw.png
|
||||
source: frontend/static/img/logo-epita-bw.png
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/img/epita.png
|
||||
source: frontend/static/img/epita.png
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/img/rcc.png
|
||||
source: frontend/static/img/rcc.png
|
||||
- path: www/htdocs-frontend/img/comcyber.png
|
||||
source: frontend/static/img/comcyber.png
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/favicon.ico
|
||||
source: frontend/static/favicon.ico
|
||||
|
|
@ -248,6 +265,9 @@ files:
|
|||
- path: www/htdocs-frontend/e404.html
|
||||
source: frontend/static/e404.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/e404.json
|
||||
source: frontend/static/e404.json
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/css/bootstrap.min.css
|
||||
source: frontend/static/css/bootstrap.min.css
|
||||
mode: "0644"
|
||||
|
|
@ -275,27 +295,27 @@ files:
|
|||
- path: www/htdocs-frontend/js/challenge.js
|
||||
source: frontend/static/js/challenge.js
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/js/public.js
|
||||
source: frontend/static/js/public.js
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/js/bootstrap.min.js
|
||||
source: frontend/static/js/bootstrap.min.js
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/js/popper.min.js
|
||||
source: frontend/static/js/popper.min.js
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/js/jquery.min.js
|
||||
source: frontend/static/js/jquery.min.js
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/js/angular-animate.min.js
|
||||
source: frontend/static/js/angular-animate.min.js
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/js/angular-route.min.js
|
||||
source: frontend/static/js/angular-route.min.js
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/js/blake2b.js
|
||||
source: frontend/static/js/blake2b.js
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/e413.html
|
||||
source: frontend/static/e413.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/e413.json
|
||||
source: frontend/static/e413.json
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/fonts/FantasqueSansMono-Regular.woff
|
||||
source: frontend/static/fonts/FantasqueSansMono-Regular.woff
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/fonts/glyphicons-halflings-regular.woff2
|
||||
source: frontend/static/fonts/glyphicons-halflings-regular.woff2
|
||||
mode: "0644"
|
||||
|
|
@ -314,21 +334,18 @@ files:
|
|||
- path: www/htdocs-frontend/welcome.html
|
||||
source: frontend/static/welcome.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/public.html
|
||||
source: frontend/static/public.html
|
||||
- path: www/htdocs-frontend/welcome.json
|
||||
source: frontend/static/welcome.json
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/index.html
|
||||
source: frontend/static/index.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/views/videos.html
|
||||
source: frontend/static/views/videos.html
|
||||
- path: www/htdocs-frontend/views/defi.html
|
||||
source: frontend/static/views/defi.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/views/home.html
|
||||
source: frontend/static/views/home.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/views/theme.html
|
||||
source: frontend/static/views/theme.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/views/rank.html
|
||||
source: frontend/static/views/rank.html
|
||||
mode: "0644"
|
||||
|
|
@ -338,9 +355,18 @@ files:
|
|||
- path: www/htdocs-frontend/views/rules.html
|
||||
source: frontend/static/views/rules.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/views/tag.html
|
||||
source: frontend/static/views/tag.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/views/team-edit.html
|
||||
source: frontend/static/views/team-edit.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/views/theme.html
|
||||
source: frontend/static/views/theme.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/views/videos.html
|
||||
source: frontend/static/views/videos.html
|
||||
mode: "0644"
|
||||
- path: www/htdocs-frontend/robots.txt
|
||||
source: frontend/static/robots.txt
|
||||
mode: "0644"
|
||||
|
|
|
|||
Reference in a new issue