diff --git a/apps/rego-tunnel-linux/docker-compose.json b/apps/rego-tunnel-linux/docker-compose.json index 58da90e..e765dba 100644 --- a/apps/rego-tunnel-linux/docker-compose.json +++ b/apps/rego-tunnel-linux/docker-compose.json @@ -1,20 +1,40 @@ { + "schemaVersion": 2, "services": [ { "name": "rego-tunnel-linux", "image": "rego-vpn:latest", - "isMain": true, + "environment": [ + { + "key": "VNC_PASSWORD", + "value": "${VNC_PASSWORD}" + }, + { + "key": "NOVNC_PORT", + "value": "8806" + } + ], "internalPort": 8806, - "privileged": true, - "capAdd": ["NET_ADMIN"], - "devices": ["/dev/net/tun:/dev/net/tun"], - "environment": { - "VNC_PASSWORD": "${VNC_PASSWORD}", - "NOVNC_PORT": "8806" - }, "volumes": [ - { "hostPath": "${APP_DATA_DIR}/data", "containerPath": "/root" } - ] + { + "hostPath": "${APP_DATA_DIR}/data", + "containerPath": "/root", + "readOnly": false, + "shared": false, + "private": false + } + ], + "devices": [ + "/dev/net/tun:/dev/net/tun" + ], + "privileged": true, + "capAdd": [ + "NET_ADMIN" + ], + "isMain": true, + "extraLabels": { + "runtipi.managed": true + } } ] } diff --git a/apps/rego-tunnel-linux/docker-compose.yml b/apps/rego-tunnel-linux/docker-compose.yml index 664c01e..958d092 100644 --- a/apps/rego-tunnel-linux/docker-compose.yml +++ b/apps/rego-tunnel-linux/docker-compose.yml @@ -1,33 +1,26 @@ services: rego-tunnel-linux: container_name: rego-tunnel-linux - image: qemux/qemu:latest + image: rego-vpn:latest restart: unless-stopped + privileged: true devices: - - /dev/kvm - - /dev/net/tun + - /dev/net/tun:/dev/net/tun cap_add: - NET_ADMIN - stop_grace_period: 2m ports: - - ${APP_PORT}:8006 + - ${APP_PORT}:8806 environment: - - BOOT=https://releases.ubuntu.com/24.04.1/ubuntu-24.04.1-desktop-amd64.iso - - RAM_SIZE=${LINUX_RAM_GB}G - - CPU_CORES=${LINUX_CPU_CORES} - - DISK_SIZE=${LINUX_DISK_SIZE_GB}G + - VNC_PASSWORD=${VNC_PASSWORD} + - NOVNC_PORT=8806 volumes: - - ${APP_DATA_DIR}/data/storage:/storage - - ${APP_DATA_DIR}/data/shared:/shared - - /etc/runtipi/repos/runtipi/apps/rego-tunnel-linux/vpn_scripts:/vpn_scripts:ro + - ${APP_DATA_DIR}/data:/root networks: - tipi_main_network - sysctls: - - net.ipv4.ip_forward=1 labels: traefik.enable: true traefik.http.middlewares.rego-tunnel-linux-web-redirect.redirectscheme.scheme: https - traefik.http.services.rego-tunnel-linux.loadbalancer.server.port: 8006 + traefik.http.services.rego-tunnel-linux.loadbalancer.server.port: 8806 traefik.http.routers.rego-tunnel-linux-insecure.rule: Host(`${APP_DOMAIN}`) traefik.http.routers.rego-tunnel-linux-insecure.entrypoints: web traefik.http.routers.rego-tunnel-linux-insecure.service: rego-tunnel-linux