Update fickit
This commit is contained in:
parent
a499d23149
commit
20df137eeb
12 changed files with 514 additions and 98 deletions
|
|
@ -1,29 +1,31 @@
|
|||
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: sysctl
|
||||
image: linuxkit/sysctl:4c1ef93bb5eb1a877318db4b2daa6768ed002e21
|
||||
command: ["/usr/bin/sysctl", "-w", "net.ipv6.conf.all.disable_ipv6=1"]
|
||||
- name: mod
|
||||
image: linuxkit/modprobe:v0.6
|
||||
command: ["/bin/sh", "-c", "modprobe e1000e"]
|
||||
|
||||
# - name: sysctl
|
||||
# image: linuxkit/sysctl:v0.6
|
||||
# command: ["/usr/bin/sysctl", "-w", "net.ipv6.conf.all.disable_ipv6=1"]
|
||||
|
||||
# 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
|
||||
|
|
@ -32,7 +34,7 @@ onboot:
|
|||
# - name: ntp
|
||||
# image: linuxkit/openntpd:536e5947607c9e6a6771957c2ff817230cba0d3c
|
||||
- name: synchro-ip-setup
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
image: linuxkit/ip:v0.6
|
||||
command: ["/bin/sh", "-c", "ip a add 10.10.10.1/29 dev eth0; ip link set eth0 up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -41,8 +43,8 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/synchro
|
||||
- name: admin-ip-setup
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
command: ["/bin/sh", "-c", "ip a add 192.168.0.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;" ]
|
||||
image: linuxkit/ip:v0.6
|
||||
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:
|
||||
interfaces:
|
||||
|
|
@ -53,7 +55,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/fic-admin
|
||||
- name: backend-ip-setup
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
image: linuxkit/ip:v0.6
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.0.3/24 dev vethin-backend; ip link set vethin-backend up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -64,7 +66,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/fic-backend
|
||||
- name: mysql-ip-setup
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
image: linuxkit/ip:v0.6
|
||||
command: ["/bin/sh", "-c", "ip a add 172.17.0.4/24 dev vethin-db; ip link set vethin-db up;" ]
|
||||
net: new
|
||||
runtime:
|
||||
|
|
@ -75,7 +77,7 @@ onboot:
|
|||
bindNS:
|
||||
net: /run/netns/db
|
||||
- name: bridge-setup
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
image: linuxkit/ip:v0.6
|
||||
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:
|
||||
|
|
@ -83,7 +85,7 @@ onboot:
|
|||
add: bridge
|
||||
|
||||
- name: firewall-synchro
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
image: linuxkit/ip:v0.6
|
||||
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
|
||||
|
|
@ -93,7 +95,7 @@ onboot:
|
|||
mkdir:
|
||||
- /var/lib/fic/teams
|
||||
- name: firewall-admin
|
||||
image: linuxkit/ip:284c21791d8c05c49eccbd8e8cc2fb97bbd61842
|
||||
image: linuxkit/ip:v0.6
|
||||
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
|
||||
|
|
@ -101,8 +103,12 @@ onboot:
|
|||
net: /run/netns/fic-admin
|
||||
|
||||
services:
|
||||
# - name: getty
|
||||
# image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478
|
||||
# env:
|
||||
# - INSECURE=true
|
||||
- name: rngd
|
||||
image: linuxkit/rngd:94e01a4b16fadb053455cdc2269c4eb0b39199cd
|
||||
image: linuxkit/rngd:v0.6
|
||||
- name: db
|
||||
image: mariadb:latest
|
||||
command: ["/bin/bash", "/usr/local/bin/docker-entrypoint.sh", "mysqld"]
|
||||
|
|
@ -134,17 +140,19 @@ services:
|
|||
- FICCA_PASS=jee8AhloAith1aesCeQu5ahgIegaeM4K
|
||||
binds:
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
- /var/lib/fic/files:/srv/FILES
|
||||
- /var/lib/fic/raw_files:/mnt/fic
|
||||
- /var/lib/fic/dashboard:/srv/DASHBOARD
|
||||
- /var/lib/fic/files:/srv/FILES
|
||||
- /var/lib/fic/pki:/srv/PKI
|
||||
- /var/lib/fic/settings:/srv/SETTINGS
|
||||
- /var/lib/fic/teams:/srv/TEAMS
|
||||
- /var/lib/fic/settings:/srv/SETTINGS
|
||||
net: /run/netns/fic-admin
|
||||
pid: new
|
||||
ipc: new
|
||||
uts: new
|
||||
runtime:
|
||||
mkdir:
|
||||
- /var/lib/fic/dashboard
|
||||
- /var/lib/fic/files
|
||||
- /var/lib/fic/raw_files
|
||||
- /var/lib/fic/pki
|
||||
|
|
@ -156,9 +164,9 @@ services:
|
|||
- MYSQL_HOST=tcp(db:3306)
|
||||
binds:
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
- /var/lib/fic/teams:/srv/TEAMS
|
||||
- /var/lib/fic/settings:/srv/SETTINGS:ro
|
||||
- /var/lib/fic/submissions:/srv/submissions
|
||||
- /var/lib/fic/teams:/srv/TEAMS
|
||||
net: /run/netns/fic-backend
|
||||
pid: new
|
||||
ipc: new
|
||||
|
|
@ -168,15 +176,31 @@ services:
|
|||
- /var/lib/fic/settings
|
||||
- /var/lib/fic/submissions
|
||||
- /var/lib/fic/teams
|
||||
- name: fic-dashboard
|
||||
image: nemunaire/fic-dashboard:latest
|
||||
binds:
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
- /var/lib/fic/dashboard:/srv/DASHBOARD
|
||||
- /var/lib/fic/teams:/srv/TEAMS:ro
|
||||
- /var/lib/fic/settings:/srv/SETTINGS:ro
|
||||
net: /run/netns/fic-admin
|
||||
pid: new
|
||||
ipc: new
|
||||
uts: new
|
||||
runtime:
|
||||
mkdir:
|
||||
- /var/lib/fic/dashboard
|
||||
- /var/lib/fic/teams
|
||||
- /var/lib/fic/settings
|
||||
- name: fic-synchro
|
||||
image: nemunaire/rsync:f8a6d2b0b1064ea3cb3601a159bb886c47a76ce3
|
||||
image: nemunaire/rsync:416df0e1fe1562d5d1c63461dacd1267b47a4f05
|
||||
command: ["/bin/ash", "/root/synchro.sh"]
|
||||
binds:
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
- /root/.ssh/id_ed25519:/root/.ssh/id_ed25519:ro
|
||||
- /root/synchro.sh:/root/synchro.sh:ro
|
||||
- /var/lib/fic/files:/srv/FILES:ro
|
||||
- /var/lib/fic/pki/ca.key:/srv/PKI/ca.key:ro
|
||||
#- /var/lib/fic/pki/ca.key:/srv/PKI/ca.key:ro
|
||||
- /var/lib/fic/pki/shared:/srv/PKI/shared:ro
|
||||
- /var/lib/fic/settings:/srv/SETTINGS:ro
|
||||
- /var/lib/fic/submissions:/srv/submissions
|
||||
|
|
@ -193,11 +217,12 @@ services:
|
|||
- /var/lib/fic/submissions
|
||||
- /var/lib/fic/teams
|
||||
- name: sshd
|
||||
image: nemunaire/rsync:f8a6d2b0b1064ea3cb3601a159bb886c47a76ce3
|
||||
image: nemunaire/rsync:416df0e1fe1562d5d1c63461dacd1267b47a4f05
|
||||
binds:
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
- /root/.ssh/authorized_keys:/root/.ssh/authorized_keys:ro
|
||||
- /var/lib/fic/outofsync:/var/lib/fic/outofsync
|
||||
- /var/lib/fic/raw_files:/mnt/fic
|
||||
net: /run/netns/fic-admin
|
||||
runtime:
|
||||
mkdir:
|
||||
|
|
@ -235,8 +260,9 @@ files:
|
|||
[0:0] -A INPUT -m conntrack --ctstate INVALID -j DROP
|
||||
[0:0] -A INPUT -p icmp -j ACCEPT
|
||||
[0:0] -A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
|
||||
[0:0] -A INPUT -i eth1 -s 192.168.0.0/24 -p tcp -m conntrack --ctstate NEW -m tcp --dport ssh -j ACCEPT
|
||||
[0:0] -A INPUT -i eth1 -s 192.168.23.0/24 -p tcp -m conntrack --ctstate NEW -m tcp --dport ssh -j ACCEPT
|
||||
[0:0] -A INPUT -p tcp -m conntrack --ctstate NEW -m tcp --dport 8081 -j ACCEPT
|
||||
[0:0] -A INPUT -p tcp -m conntrack --ctstate NEW -m tcp --dport 8082 -j ACCEPT
|
||||
[0:0] -A INPUT -i vethin-admin -s 172.17.0.0/24 -p tcp -m conntrack --ctstate NEW -j ACCEPT
|
||||
[0:0] -A INPUT -j LOG
|
||||
[0:0] -A FORWARD -j LOG
|
||||
|
|
|
|||
Reference in a new issue