fixup! Update rego-tunnel to use rego-vpn image

apps/rego-tunnel/docker-compose.json

@@ -5,19 +5,54 @@
       "image": "rego-vpn:latest",
       "isMain": true,
       "internalPort": 8006,
-      "capAdd": ["NET_ADMIN"],
+      "addPorts": [
-      "devices": ["/dev/kvm", "/dev/net/tun"],
+        {
-      "environment": {
+          "hostPort": 8005,
-        "RAM_SIZE": "${WINDOWS_RAM_GB}G",
+          "containerPort": 8005,
-        "CPU_CORE": "${WINDOWS_CPU_CORES}",
+          "tcp": true,
-        "DISK_SIZE": "${WINDOWS_DISK_SIZE_GB}G",
+          "udp": true
-        "VERSION": "${WINDOWS_VERSION}"
+        }
-      },
+      ],
+      "environment": [
+        {
+          "key": "RAM_SIZE",
+          "value": "${WINDOWS_RAM_GB}G"
+        },
+        {
+          "key": "CPU_CORE",
+          "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/shared", "containerPath": "/shared" },
+          "hostPath": "${APP_DATA_DIR}/data/storage",
-        { "hostPath": "${APP_DATA_DIR}/data/start.sh", "containerPath": "/run/start.sh" }
+          "containerPath": "/storage"
-      ]
+        },
+        {
+          "hostPath": "${APP_DATA_DIR}/data/shared",
+          "containerPath": "/shared"
+        },
+        {
+          "hostPath": "${APP_DATA_DIR}/data/start.sh",
+          "containerPath": "/run/start.sh"
+        }
+      ],
+      "sysctls": {
+        "net.ipv4.ip_forward": 1
+      },
+      "devices": ["/dev/kvm", "/dev/net/tun"],
+      "capAdd": ["NET_ADMIN"],
+      "stopGracePeriod": "2m"
     }
-  ]
+  ],
-}
+  "schemaVersion": 2,
+  "$schema": "https://schemas.runtipi.io/v2/dynamic-compose.json"
+}

apps/rego-tunnel/docker-compose.yml

@@ -10,55 +10,40 @@ services:
     cap_add:
       - NET_ADMIN
     stop_grace_period: 2m
-
     ports:
       # Web console (Tipi APP_PORT -> 8006)
-      - "192.168.0.151:${APP_PORT}:8006"
+      - ${APP_PORT}:8006
-
     environment:
       - RAM_SIZE=${WINDOWS_RAM_GB}G
       - CPU_CORE=${WINDOWS_CPU_CORES}
       - DISK_SIZE=${WINDOWS_DISK_SIZE_GB}G
-
+      - VERSION=${WINDOWS_VERSION}
     volumes:
       - ${APP_DATA_DIR}/data/storage:/storage
       - ${APP_DATA_DIR}/data/shared:/shared
       - ${APP_DATA_DIR}/data/start.sh:/run/start.sh
-      
-
     networks:
       - tipi_main_network
-
     sysctls:
       - net.ipv4.ip_forward=1
-
     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.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
       traefik.http.routers.rego-tunnel-insecure.middlewares: rego-tunnel-web-redirect
-
       traefik.http.routers.rego-tunnel.rule: Host(`${APP_DOMAIN}`)
       traefik.http.routers.rego-tunnel.entrypoints: websecure
       traefik.http.routers.rego-tunnel.service: rego-tunnel
       traefik.http.routers.rego-tunnel.tls.certresolver: myresolver
-
       traefik.http.routers.rego-tunnel-local-insecure.rule: Host(`rego-tunnel.${LOCAL_DOMAIN}`)
       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
-
-networks:
-  tipi_main_network:
-    external: true