mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2026-09-30 10:36:41 +00:00
feat(oci): run official container images as native LXC containers
Adds the OCI manager: an engine that turns a Docker Compose file into an LXC definition, a catalog of 365 applications drawn from LinuxServer.io and other container image sources, and a per-instance registry recording what each container was built from. Reachable from the main menu. Catalog text is translated like every other string in the project: the taglines go through translate() and land in lang/*.json, so the entries read in all eight languages instead of only English. Translation cache builder: - a failed translation leaves the key absent rather than writing English, which previously made the string count as translated forever - a result identical to a 3+ word source is rejected, catching a provider that silently returns the text it was given - strings that are nothing but glossary terms keep their source spelling instead of being discarded as failures - no backoff between attempts when the provider is deterministic - application names are protected so "HAOS One" survives translation - argos joins the provider list, and the workflow reads the OCI sources Audit & Report: - findings that moved in the wrong direction between runs are reported alongside the ones that improved - an accepted risk can carry a review date and is flagged when it falls due - backup checks explain in plain language what they looked at and what to do next Monitor: - disks can be excluded from periodic reads, and an idle disk says so instead of showing a stale temperature - per-disk identity survives a controller or enclosure change - scheduled Borg backups resolve their SSH key from the repository entry - PVE upgrades log the package list and the resulting dpkg changes The web build no longer copies scripts/ into public/: the documentation links to GitHub, so nothing read that folder. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -40,9 +40,10 @@ CATALOG_FILE = os.path.join(OCI_BASE_DIR, "catalog.json")
|
||||
INSTALLED_FILE = os.path.join(OCI_BASE_DIR, "installed.json")
|
||||
INSTANCES_DIR = os.path.join(OCI_BASE_DIR, "instances")
|
||||
|
||||
# Source catalog from Scripts (bundled with ProxMenux)
|
||||
SCRIPTS_CATALOG = "/usr/local/share/proxmenux/scripts/oci/catalog.json"
|
||||
DEV_SCRIPTS_CATALOG = os.path.join(os.path.dirname(__file__), "..", "..", "Scripts", "oci", "catalog.json")
|
||||
# Source catalog shipped with ProxMenux, inside the OCI engine
|
||||
SCRIPTS_CATALOG = os.path.join(OCI_BASE_DIR, "engine", "addons", "secure-gateway.json")
|
||||
LEGACY_SCRIPTS_CATALOG = "/usr/local/share/proxmenux/scripts/oci/catalog.json"
|
||||
DEV_SCRIPTS_CATALOG = os.path.join(os.path.dirname(__file__), "..", "..", "oci", "addons", "secure-gateway.json")
|
||||
|
||||
# Encryption key file
|
||||
ENCRYPTION_KEY_FILE = os.path.join(OCI_BASE_DIR, ".encryption_key")
|
||||
@@ -143,10 +144,10 @@ def ensure_oci_directories():
|
||||
os.makedirs(INSTANCES_DIR, exist_ok=True)
|
||||
|
||||
if not os.path.exists(CATALOG_FILE):
|
||||
if os.path.exists(SCRIPTS_CATALOG):
|
||||
shutil.copy2(SCRIPTS_CATALOG, CATALOG_FILE)
|
||||
elif os.path.exists(DEV_SCRIPTS_CATALOG):
|
||||
shutil.copy2(DEV_SCRIPTS_CATALOG, CATALOG_FILE)
|
||||
for source in (SCRIPTS_CATALOG, LEGACY_SCRIPTS_CATALOG, DEV_SCRIPTS_CATALOG):
|
||||
if os.path.exists(source):
|
||||
shutil.copy2(source, CATALOG_FILE)
|
||||
break
|
||||
|
||||
if not os.path.exists(INSTALLED_FILE):
|
||||
with open(INSTALLED_FILE, 'w') as f:
|
||||
@@ -689,7 +690,7 @@ def load_catalog() -> Dict[str, Any]:
|
||||
"""Load the OCI app catalog."""
|
||||
ensure_oci_directories()
|
||||
|
||||
for path in [CATALOG_FILE, SCRIPTS_CATALOG, DEV_SCRIPTS_CATALOG]:
|
||||
for path in [CATALOG_FILE, SCRIPTS_CATALOG, LEGACY_SCRIPTS_CATALOG, DEV_SCRIPTS_CATALOG]:
|
||||
if os.path.exists(path):
|
||||
try:
|
||||
with open(path, 'r') as f:
|
||||
|
||||
Reference in New Issue
Block a user