Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2025-11-18 19:46:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update AppImage

Browse Source
This commit is contained in:
MacRimi
2025-10-28 23:18:32 +01:00
parent f606e131a7
commit 813c6aab13
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
AppImage/components/virtual-machines.tsx
View File

@@ -123,6 +123,7 @@ interface VMDetails extends VMData {
gpu_passthrough?: string[] gpu_passthrough?: string[]
devices?: string[] devices?: string[]
} }
lxc_ip?: string
} }
const fetcher = async (url: string) => { const fetcher = async (url: string) => {
@@ -157,7 +158,11 @@ const formatUptime = (seconds: number) => {
return `${days}d ${hours}h ${minutes}m` return `${days}d ${hours}h ${minutes}m`
} }
const extractIPFromConfig = (config?: VMConfig): string => { const extractIPFromConfig = (config?: VMConfig, lxcIP?: string): string => {
if (lxcIP) {
return lxcIP
}
if (!config) return "DHCP" if (!config) return "DHCP"
// Check net0, net1, net2, etc. // Check net0, net1, net2, etc.
@@ -282,7 +287,9 @@ export function VirtualMachines() {
const response = await fetch(`/api/vms/${lxc.vmid}`) const response = await fetch(`/api/vms/${lxc.vmid}`)
if (response.ok) { if (response.ok) {
const details = await response.json() const details = await response.json()
if (details.config) { if (details.lxc_ip) {
configs[lxc.vmid] = details.lxc_ip
} else if (details.config) {
configs[lxc.vmid] = extractIPFromConfig(details.config) configs[lxc.vmid] = extractIPFromConfig(details.config)
} }
} }
@@ -1243,9 +1250,9 @@ export function VirtualMachines() {
<div> <div>
<div className="text-xs text-muted-foreground mb-1">IP Address</div> <div className="text-xs text-muted-foreground mb-1">IP Address</div>
<div <div
className={`font-semibold ${extractIPFromConfig(vmDetails.config) === "DHCP" ? "text-yellow-500" : "text-green-500"}`} className={`font-semibold ${extractIPFromConfig(vmDetails.config, vmDetails.lxc_ip) === "DHCP" ? "text-yellow-500" : "text-green-500"}`}
> >
{extractIPFromConfig(vmDetails.config)} {extractIPFromConfig(vmDetails.config, vmDetails.lxc_ip)}
</div> </div>
</div> </div>
)} )}

20
AppImage/scripts/flask_server.py
View File

@@ -165,6 +165,26 @@ def parse_lxc_hardware_config(vmid, node):
return hardware_info return hardware_info
def get_lxc_ip_from_lxc_info(vmid):
"""Get LXC IP address using lxc-info command (for DHCP containers)"""
try:
result = subprocess.run(
['lxc-info', '-n', str(vmid), '-iH'],
capture_output=True,
text=True,
timeout=5
)
if result.returncode == 0:
ip = result.stdout.strip()
# Return IP only if it's valid (not empty)
if ip and ip != '':
return ip
return None
except Exception:
# Silently fail if lxc-info is not available or fails
return None
# Helper function to format bytes into human-readable string # Helper function to format bytes into human-readable string
def format_bytes(size_in_bytes): def format_bytes(size_in_bytes):
"""Converts bytes to a human-readable string (KB, MB, GB, TB).""" """Converts bytes to a human-readable string (KB, MB, GB, TB)."""