maggesandClaude Sonnet 5
5b47b4cc0a
- Package #9-11: catatonit (pod infra init), nftables (netavark firewall backend), docker-compose (external compose provider for `podman compose`) — all vendored prebuilt binaries, versions.env pinned, propagated through build-packages.sh/release.sh/podman.plg/verify+update-packages.sh. - Fix WebUI: every POST action was silently failing (empty response body) because Unraid's own CSRF protection was never satisfied — app.js now sends the page's csrf_token as X-CSRF-Token. - Fix WebUI: PodmanClient::pullImage() assumed a single JSON response, but /images/pull actually streams newline-delimited JSON — every successful pull was throwing "Expected a JSON object/array response". - Fix WebUI: compose.php's up/down status detection had the same single-JSON-vs-NDJSON bug for `podman compose ps`, plus stderr was corrupting the parse. - Add cache-busting (?v=<mtime>) to Podman.page's script/style tags so a redeployed JS/CSS fix isn't served stale from browser cache. - Add a reusable modal dialog (app.js openFormModal) replacing prompt()/alert() for New Volume/Network/Pull Image. - Add host-path (bind-mount) support when creating a named volume. - Add Create Container (image, name, network mode incl. custom networks, ports, volumes, env, restart policy, privileged, start-after-create), auto-pulling the image on first use since /containers/create doesn't. All fixes verified live against a real podman system service and, where reachable, via the actual WebUI over the real socket — not just unit-level. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
93 lines
3.2 KiB
PHP
93 lines
3.2 KiB
PHP
<?php
|
|
/**
|
|
* ajax/volumes.php
|
|
*
|
|
* Backs the Volumes panel. Bind-mounted appdata (e.g. /mnt/user/appdata/...)
|
|
* intentionally does not appear here — only Podman-managed named volumes
|
|
* do, since bind mounts aren't a libpod-managed resource at all (see
|
|
* docs/ARCHITECTURE.md section 9).
|
|
*
|
|
* Actions (?action=...):
|
|
* list GET -> normalized volume list, with usedBy counts
|
|
* create POST {"name": "...", "driver": "local", "path": "/mnt/cache/..." (optional)}
|
|
* remove POST {"name": "...", "force": false}
|
|
*/
|
|
|
|
declare(strict_types=1);
|
|
|
|
require __DIR__ . '/../include/bootstrap.php';
|
|
|
|
$action = $_GET['action'] ?? '';
|
|
|
|
switch ($action) {
|
|
case 'list':
|
|
podman_json_response(volumes_list($client));
|
|
break;
|
|
|
|
case 'create':
|
|
$body = podman_read_json_body();
|
|
$name = (string) ($body['name'] ?? '');
|
|
if ($name === '') {
|
|
podman_json_error('Missing name in request body', 400);
|
|
}
|
|
$path = trim((string) ($body['path'] ?? ''));
|
|
if ($path !== '' && !str_starts_with($path, '/')) {
|
|
podman_json_error("Host path ({$path}) must be an absolute path.", 400);
|
|
}
|
|
podman_json_response($client->createVolume($name, (string) ($body['driver'] ?? 'local'), $path !== '' ? $path : null));
|
|
break;
|
|
|
|
case 'remove':
|
|
$body = podman_read_json_body();
|
|
$name = (string) ($body['name'] ?? '');
|
|
if ($name === '') {
|
|
podman_json_error('Missing name in request body', 400);
|
|
}
|
|
$client->removeVolume($name, (bool) ($body['force'] ?? false));
|
|
podman_json_response(['status' => 'removed']);
|
|
break;
|
|
|
|
default:
|
|
podman_json_error("Unknown action '{$action}'", 400);
|
|
}
|
|
|
|
/** @return array<int,array<string,mixed>> */
|
|
function volumes_list(PodmanClient $client): array
|
|
{
|
|
$raw = $client->listVolumes();
|
|
|
|
$usageCounts = [];
|
|
foreach ($client->listContainers(true) as $c) {
|
|
foreach (($c['Mounts'] ?? []) as $mount) {
|
|
$volName = $mount['Name'] ?? null;
|
|
if (is_string($volName) && $volName !== '') {
|
|
$usageCounts[$volName] = ($usageCounts[$volName] ?? 0) + 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
$out = [];
|
|
foreach ($raw as $v) {
|
|
$name = (string) ($v['Name'] ?? '');
|
|
$options = $v['Options'] ?? [];
|
|
// A volume created with our "Host path" field carries
|
|
// type=none,o=bind,device=<path> (see PodmanClient::createVolume)
|
|
// — surfaced separately from 'mountpoint' (podman's own internal
|
|
// storage path, which stays populated even for bind-backed
|
|
// volumes) so the UI can show users the host path they actually
|
|
// asked for.
|
|
$hostPath = (is_array($options) && ($options['o'] ?? '') === 'bind') ? (string) ($options['device'] ?? '') : null;
|
|
$out[] = [
|
|
'name' => $name,
|
|
'driver' => (string) ($v['Driver'] ?? 'local'),
|
|
'mountpoint' => (string) ($v['Mountpoint'] ?? ''),
|
|
'hostPath' => $hostPath,
|
|
'createdAt' => podman_parse_time($v['CreatedAt'] ?? null),
|
|
'usedBy' => $usageCounts[$name] ?? 0,
|
|
];
|
|
}
|
|
|
|
usort($out, static fn($a, $b) => strcmp($a['name'], $b['name']));
|
|
return $out;
|
|
}
|