fix(rego-tunnel): align compose with RunTipi
Some checks failed
Test / test (push) Has been cancelled

This commit is contained in:
2025-12-29 06:12:04 +00:00
parent 55ca6fe620
commit cb7e309915

View File

@@ -1,56 +1,63 @@
services: services:
rego-tunnel: rego-tunnel:
container_name: rego-tunnel
image: git.alexzaw.dev/alexz/linux-vm:latest image: git.alexzaw.dev/alexz/linux-vm:latest
restart: unless-stopped restart: unless-stopped
privileged: true networks:
devices: rego-tunnel_runtipi_network:
- /dev/kvm gw_priority: 0
- /dev/net/tun tipi_main_network:
cap_add: gw_priority: 1
- NET_ADMIN environment:
stop_grace_period: 2m VM_RAM: ${WINDOWS_RAM_GB}G
VM_CPUS: ${WINDOWS_CPU_CORES}
BRIDGE_NAME: ${BRIDGE_NAME}
TAP_NAME: ${TAP_NAME}
BRIDGE_CIDR: ${BRIDGE_CIDR}
VM_NET_IP: ${VM_NET_IP}
VM_SUBNET: ${VM_SUBNET}
TARGET_IP: ${TARGET_IP}
VM_MAC: ${VM_MAC}
DNS_SERVERS: ${DNS_SERVERS}
LEASE_TIME: ${LEASE_TIME}
HOSTSHARE_DIR: ${HOSTSHARE_DIR}
ports: ports:
- ${APP_PORT}:8006 - ${APP_PORT}:8006
environment:
- VM_RAM=${WINDOWS_RAM_GB}G
- VM_CPUS=${WINDOWS_CPU_CORES}
- BRIDGE_NAME=${BRIDGE_NAME:-br-rego-vpn}
- TAP_NAME=${TAP_NAME:-tap0}
- BRIDGE_CIDR=${BRIDGE_CIDR:-100.100.0.1}
- VM_NET_IP=${VM_NET_IP:-100.100.0.2}
- VM_SUBNET=${VM_SUBNET:-100.100.0.0}
- TARGET_IP=${TARGET_IP:-10.35.33.230}
- VM_MAC=${VM_MAC:-52:54:00:12:34:56}
- DNS_SERVERS=${DNS_SERVERS:-1.1.1.1,8.8.8.8}
- LEASE_TIME=${LEASE_TIME:-12h}
- HOSTSHARE_DIR=${HOSTSHARE_DIR:-${APP_DATA_DIR}}
volumes: volumes:
- /etc/runtipi/user-config/runtipi/rego-tunnel/storage/linux-vm.qcow2:/vm/linux-vm.qcow2 - /etc/runtipi/user-config/runtipi/rego-tunnel/storage/linux-vm.qcow2:/vm/linux-vm.qcow2
- /etc/runtipi/user-config/runtipi/rego-tunnel/shared:/shared - /etc/runtipi/user-config/runtipi/rego-tunnel/shared:/shared
- ${HOSTSHARE_DIR:-${APP_DATA_DIR}}:/hostshare - ${HOSTSHARE_DIR}:/hostshare
networks:
- tipi_main_network
sysctls:
- net.ipv4.ip_forward=1
labels: labels:
generated: true
traefik.enable: true traefik.enable: true
traefik.http.middlewares.rego-tunnel-web-redirect.redirectscheme.scheme: https traefik.docker.network: runtipi_tipi_main_network
traefik.http.services.rego-tunnel.loadbalancer.server.port: 8006 traefik.http.middlewares.rego-tunnel-runtipi-web-redirect.redirectscheme.scheme: https
traefik.http.routers.rego-tunnel-insecure.rule: Host(`${APP_DOMAIN}`) traefik.http.services.rego-tunnel-runtipi.loadbalancer.server.port: "8006"
traefik.http.routers.rego-tunnel-insecure.entrypoints: web traefik.http.routers.rego-tunnel-runtipi-insecure.rule: Host(`${APP_DOMAIN}`)
traefik.http.routers.rego-tunnel-insecure.service: rego-tunnel traefik.http.routers.rego-tunnel-runtipi-insecure.entrypoints: web
traefik.http.routers.rego-tunnel-insecure.middlewares: rego-tunnel-web-redirect traefik.http.routers.rego-tunnel-runtipi-insecure.service: rego-tunnel-runtipi
traefik.http.routers.rego-tunnel.rule: Host(`${APP_DOMAIN}`) traefik.http.routers.rego-tunnel-runtipi-insecure.middlewares: rego-tunnel-runtipi-web-redirect
traefik.http.routers.rego-tunnel.entrypoints: websecure traefik.http.routers.rego-tunnel-runtipi.rule: Host(`${APP_DOMAIN}`)
traefik.http.routers.rego-tunnel.service: rego-tunnel traefik.http.routers.rego-tunnel-runtipi.entrypoints: websecure
traefik.http.routers.rego-tunnel.tls.certresolver: myresolver traefik.http.routers.rego-tunnel-runtipi.service: rego-tunnel-runtipi
traefik.http.routers.rego-tunnel-local-insecure.rule: Host(`rego-tunnel.${LOCAL_DOMAIN}`) traefik.http.routers.rego-tunnel-runtipi.tls.certresolver: myresolver
traefik.http.routers.rego-tunnel-local-insecure.entrypoints: web
traefik.http.routers.rego-tunnel-local-insecure.service: rego-tunnel
traefik.http.routers.rego-tunnel-local-insecure.middlewares: rego-tunnel-web-redirect
traefik.http.routers.rego-tunnel-local.rule: Host(`rego-tunnel.${LOCAL_DOMAIN}`)
traefik.http.routers.rego-tunnel-local.entrypoints: websecure
traefik.http.routers.rego-tunnel-local.service: rego-tunnel
traefik.http.routers.rego-tunnel-local.tls: true
runtipi.managed: true runtipi.managed: true
runtipi.appurn: rego-tunnel:runtipi
cap_add:
- NET_ADMIN
devices:
- /dev/kvm
- /dev/net/tun
privileged: true
stop_grace_period: 2m
sysctls: {}
networks:
tipi_main_network:
name: runtipi_tipi_main_network
external: true
rego-tunnel_runtipi_network:
name: rego-tunnel_runtipi_network
external: false
ipam:
config:
- subnet: 10.128.13.0/24