Update rego-tunnel to use linux-vm from container registry

apps/rego-tunnel/docker-compose.json

@@ -2,47 +2,27 @@
   "services": [
     {
       "name": "rego-tunnel",
-      "image": "dockurr/windows:latest",
+      "image": "git.alexzaw.dev/alexz/linux-vm:latest",
       "isMain": true,
-      "internalPort": 8006,
-      "addPorts": [
-        {
-          "hostPort": 8005,
-          "containerPort": 8005,
-          "tcp": true,
-          "udp": true
-        }
-      ],
+      "internalPort": 6080,
       "environment": [
         {
-          "key": "RAM_SIZE",
+          "key": "VM_RAM",
           "value": "${WINDOWS_RAM_GB}G"
         },
         {
-          "key": "CPU_CORE",
+          "key": "VM_CPUS",
           "value": "${WINDOWS_CPU_CORES}"
-        },
-        {
-          "key": "DISK_SIZE",
-          "value": "${WINDOWS_DISK_SIZE_GB}G"
-        },
-        {
-          "key": "VERSION",
-          "value": "${WINDOWS_VERSION}"
         }
       ],
       "volumes": [
         {
-          "hostPath": "${APP_DATA_DIR}/data/storage",
-          "containerPath": "/storage"
+          "hostPath": "${APP_DATA_DIR}/data/storage/linux-vm.qcow2",
+          "containerPath": "/vm/linux-vm.qcow2"
         },
         {
           "hostPath": "${APP_DATA_DIR}/data/shared",
           "containerPath": "/shared"
-        },
-        {
-          "hostPath": "${APP_DATA_DIR}/data/start.sh",
-          "containerPath": "/run/start.sh"
         }
       ],
       "sysctls": {
@@ -50,9 +30,10 @@
       },
       "devices": ["/dev/kvm", "/dev/net/tun"],
       "capAdd": ["NET_ADMIN"],
+      "privileged": true,
       "stopGracePeriod": "2m"
     }
   ],
   "schemaVersion": 2,
   "$schema": "https://schemas.runtipi.io/v2/dynamic-compose.json"
-}
+}

apps/rego-tunnel/docker-compose.yml

@@ -1,8 +1,9 @@
 services:
   rego-tunnel:
     container_name: rego-tunnel
-    image: dockurr/windows:latest
+    image: git.alexzaw.dev/alexz/linux-vm:latest
     restart: unless-stopped
+    privileged: true
     devices:
       - /dev/kvm
       - /dev/net/tun
@@ -10,17 +11,13 @@ services:
       - NET_ADMIN
     stop_grace_period: 2m
     ports:
-      # Web console (Tipi APP_PORT -> 8006)
-      - ${APP_PORT}:8006
+      - ${APP_PORT}:6080
     environment:
-      - RAM_SIZE=${WINDOWS_RAM_GB}G
-      - CPU_CORE=${WINDOWS_CPU_CORES}
-      - DISK_SIZE=${WINDOWS_DISK_SIZE_GB}G
-      - VERSION=${WINDOWS_VERSION}
+      - VM_RAM=${WINDOWS_RAM_GB}G
+      - VM_CPUS=${WINDOWS_CPU_CORES}
     volumes:
-      - ${APP_DATA_DIR}/data/storage:/storage
+      - ${APP_DATA_DIR}/data/storage/linux-vm.qcow2:/vm/linux-vm.qcow2
       - ${APP_DATA_DIR}/data/shared:/shared
-      - /etc/runtipi/repos/runtipi/apps/rego-tunnel/vpn_scripts:/vpn_scripts:ro
     networks:
       - tipi_main_network
     sysctls:
@@ -28,7 +25,7 @@ services:
     labels:
       traefik.enable: true
       traefik.http.middlewares.rego-tunnel-web-redirect.redirectscheme.scheme: https
-      traefik.http.services.rego-tunnel.loadbalancer.server.port: 8006
+      traefik.http.services.rego-tunnel.loadbalancer.server.port: 6080
       traefik.http.routers.rego-tunnel-insecure.rule: Host(`${APP_DOMAIN}`)
       traefik.http.routers.rego-tunnel-insecure.entrypoints: web
       traefik.http.routers.rego-tunnel-insecure.service: rego-tunnel
@@ -45,4 +42,4 @@ services:
       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