f4b8d5c4f7
Unit Tests / test (push) Successful in 12m16s
Security — WireGuard: - Replace linuxserver/wireguard (privileged + SYS_MODULE + /lib/modules) with a bespoke alpine image (wireguard/Dockerfile + entrypoint.sh): CAP_NET_ADMIN only, 119 MB → 14.7 MB. Modern kernels (≥5.6) have WireGuard built in; no module loading required. Kernel-fallback comment left in compose for rare old kernels. Security — supply-chain digest pins: - CoreDNS image pinned by SHA-256 digest in docker-compose.yml. - api/Dockerfile: python:3.11-slim and docker:27-cli pinned by digest. - webui/Dockerfile: node:20-alpine and nginxinc/nginx-unprivileged:alpine pinned. - ntp/Dockerfile: alpine:3.20 pinned by digest. - wireguard/Dockerfile: alpine:3.20 pinned by digest. Security — webui non-root: - Switch from nginx:alpine (root, port 80) to nginxinc/nginx-unprivileged:alpine (port 8080, runs as nginx uid 101). Compose port mapping and all Caddy upstream references updated: cell-webui:80 → cell-webui:8080 everywhere. API layer reduction (561 MB → 245 MB): - Multi-stage api/Dockerfile: docker CLI copied from docker:27-cli stage instead of being installed via apt from Docker's external repo (removes GPG key fetch, lsb-release, gnupg, two apt-get update rounds). --no-install-recommends on remaining apt install. mkdir folded into the same RUN layer. Bug fix — WireGuard config path mismatch: - setup_cell.py wrote wg0.conf to config/wireguard/wg0.conf but wireguard_manager and the new entrypoint expect config/wireguard/wg_confs/wg0.conf (the standard wg-quick sub-directory). Fixed by creating the wg_confs/ sub-dir and writing there; REQUIRED_DIRS updated to pre-create it. Bug fix — empty chrony.conf: - config/ntp/chrony.conf was 0 bytes (pre-existing gap); added a real config (pool.ntp.org + Cloudflare, allow 172.20/10.0, local stratum 10, driftfile, makestep, rtcsync). NTP compose service now builds from ./ntp instead of pulling alpine:latest and running apk at every container start. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
173 lines
4.3 KiB
YAML
173 lines
4.3 KiB
YAML
services:
|
|
# Reverse Proxy - Caddy for routing all .cell traffic
|
|
caddy:
|
|
image: git.pic.ngo/roof/pic-caddy:latest
|
|
container_name: cell-caddy
|
|
profiles: ["core", "full"]
|
|
ports:
|
|
- "80:80"
|
|
- "443:443"
|
|
volumes:
|
|
- ./config/caddy/Caddyfile:/etc/caddy/Caddyfile
|
|
- ./data/caddy:/data
|
|
- ./config/caddy/certs:/config/caddy/certs
|
|
restart: unless-stopped
|
|
mem_limit: 256m
|
|
cpus: 0.5
|
|
pids_limit: 256
|
|
cap_add:
|
|
- NET_ADMIN
|
|
networks:
|
|
cell-network:
|
|
ipv4_address: ${CADDY_IP:-172.20.0.2}
|
|
logging:
|
|
driver: json-file
|
|
options:
|
|
max-size: "10m"
|
|
max-file: "5"
|
|
|
|
# DNS Server - CoreDNS for .cell TLD resolution
|
|
dns:
|
|
image: coredns/coredns:1.11.3@sha256:9caabbf6238b189a65d0d6e6ac138de60d6a1c419e5a341fbbb7c78382559c6e
|
|
container_name: cell-dns
|
|
profiles: ["core", "full"]
|
|
command: ["-conf", "/etc/coredns/Corefile"]
|
|
ports:
|
|
- "${DNS_PORT:-53}:53/udp"
|
|
- "${DNS_PORT:-53}:53/tcp"
|
|
volumes:
|
|
- ./config/dns/Corefile:/etc/coredns/Corefile
|
|
- ./data/dns:/data
|
|
restart: unless-stopped
|
|
mem_limit: 128m
|
|
cpus: 0.25
|
|
pids_limit: 256
|
|
networks:
|
|
cell-network:
|
|
ipv4_address: ${DNS_IP:-172.20.0.3}
|
|
logging:
|
|
driver: json-file
|
|
options:
|
|
max-size: "10m"
|
|
max-file: "5"
|
|
|
|
# NTP Server - chrony for time synchronization
|
|
ntp:
|
|
build: ./ntp
|
|
container_name: cell-ntp
|
|
profiles: ["core", "full"]
|
|
ports:
|
|
- "${NTP_PORT:-123}:123/udp"
|
|
volumes:
|
|
- ./config/ntp/chrony.conf:/etc/chrony/chrony.conf
|
|
restart: unless-stopped
|
|
mem_limit: 128m
|
|
cpus: 0.25
|
|
pids_limit: 256
|
|
networks:
|
|
cell-network:
|
|
ipv4_address: ${NTP_IP:-172.20.0.5}
|
|
cap_add:
|
|
- SYS_TIME
|
|
logging:
|
|
driver: json-file
|
|
options:
|
|
max-size: "10m"
|
|
max-file: "5"
|
|
|
|
# WireGuard VPN
|
|
wireguard:
|
|
build: ./wireguard
|
|
container_name: cell-wireguard
|
|
profiles: ["core", "full"]
|
|
ports:
|
|
- "${WG_PORT:-51820}:${WG_PORT:-51820}/udp"
|
|
volumes:
|
|
- ./config/wireguard:/config
|
|
restart: unless-stopped
|
|
mem_limit: 256m
|
|
cpus: 0.5
|
|
pids_limit: 256
|
|
networks:
|
|
cell-network:
|
|
ipv4_address: ${WG_IP:-172.20.0.9}
|
|
cap_add:
|
|
- NET_ADMIN
|
|
# FALLBACK for kernels lacking builtin WireGuard: re-add `privileged: true`,
|
|
# `- SYS_MODULE` under cap_add, and the `- /lib/modules:/lib/modules` volume.
|
|
# Default assumes a modern kernel (>= 5.6) with WireGuard compiled in.
|
|
sysctls:
|
|
- net.ipv4.conf.all.src_valid_mark=1
|
|
- net.ipv4.ip_forward=1
|
|
- net.ipv4.conf.all.rp_filter=0
|
|
logging:
|
|
driver: json-file
|
|
options:
|
|
max-size: "10m"
|
|
max-file: "5"
|
|
|
|
# API Server
|
|
api:
|
|
build: ./api
|
|
container_name: cell-api
|
|
profiles: ["core", "full"]
|
|
ports:
|
|
- "127.0.0.1:${API_PORT:-3000}:3000"
|
|
environment:
|
|
- DDNS_URL=${DDNS_URL:-https://ddns.pic.ngo/api/v1}
|
|
- DDNS_TOTP_SECRET=${DDNS_TOTP_SECRET:-S6UMA464YIKM74QHXWL5WELDIO3HFZ6K}
|
|
volumes:
|
|
- ./data/api:/app/data
|
|
- ./data/dns:/app/data/dns
|
|
- ./config/api:/app/config
|
|
- ./config/caddy:/app/config-caddy
|
|
- ./config/wireguard:/app/config/wireguard
|
|
- ./config/dns:/app/config/dns
|
|
- ./data/logs:/app/api/data/logs
|
|
- /var/run/docker.sock:/var/run/docker.sock
|
|
- ./.env:/app/.env.compose
|
|
- ./docker-compose.yml:/app/docker-compose.yml:ro
|
|
- ./docker-compose.services.yml:/app/docker-compose.services.yml
|
|
- ./scripts:/app/scripts:ro
|
|
pid: host
|
|
restart: unless-stopped
|
|
mem_limit: 512m
|
|
cpus: 1.0
|
|
pids_limit: 256
|
|
networks:
|
|
cell-network:
|
|
ipv4_address: ${API_IP:-172.20.0.10}
|
|
depends_on:
|
|
- wireguard
|
|
- dns
|
|
logging:
|
|
driver: json-file
|
|
options:
|
|
max-size: "10m"
|
|
max-file: "5"
|
|
|
|
# Web UI - React + Vite
|
|
webui:
|
|
build: ./webui
|
|
container_name: cell-webui
|
|
profiles: ["core", "full"]
|
|
ports:
|
|
- "${WEBUI_PORT:-8081}:8080"
|
|
restart: unless-stopped
|
|
mem_limit: 256m
|
|
cpus: 0.5
|
|
pids_limit: 256
|
|
networks:
|
|
cell-network:
|
|
ipv4_address: ${WEBUI_IP:-172.20.0.11}
|
|
logging:
|
|
driver: json-file
|
|
options:
|
|
max-size: "10m"
|
|
max-file: "5"
|
|
|
|
networks:
|
|
cell-network:
|
|
name: cell-network
|
|
external: true
|