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>
149 lines
6.3 KiB
Bash
Executable File
149 lines
6.3 KiB
Bash
Executable File
#!/bin/bash
|
|
# =============================================================================
|
|
# scripts/release.sh
|
|
#
|
|
# Cuts a release of the plugin itself:
|
|
# 1. Bumps the &version; entity in plugin/podman.plg to <new-version>.
|
|
# 2. Builds all eleven packages (scripts/build-packages.sh) unless
|
|
# SKIP_BUILD=1 is set (useful when CI already built them in a prior job
|
|
# and only wants this script to do the .plg/CHANGELOG bookkeeping).
|
|
# 3. Verifies + consolidates checksums (scripts/checksums.sh).
|
|
# 4. Rewrites the per-package <!ENTITY ..._txz_version/_txz_file/_txz_md5>
|
|
# entities in plugin/podman.plg from the freshly built dist/*.txz.md5
|
|
# sidecar files, and the &baseURL; entity to point at the GitHub
|
|
# Release that will hold these assets.
|
|
# 5. Moves CHANGELOG.md's [Unreleased] section under a new dated heading.
|
|
#
|
|
# This script deliberately does NOT `git commit`, `git tag`, or `gh release
|
|
# create` — it only prepares files. Committing/tagging/publishing is left to
|
|
# the caller (locally) or to .github/workflows/release.yml (in CI), so a
|
|
# human always reviews the diff before anything becomes public. See
|
|
# docs/ARCHITECTURE.md section 13 (Updates).
|
|
#
|
|
# Usage:
|
|
# scripts/release.sh <new-version> # e.g. scripts/release.sh 0.2.0
|
|
#
|
|
# Env vars:
|
|
# SKIP_BUILD=1 Skip scripts/build-packages.sh (assume dist/ already built)
|
|
# =============================================================================
|
|
|
|
set -eu
|
|
|
|
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
|
PLG_FILE="$REPO_ROOT/plugin/podman.plg"
|
|
CHANGELOG_FILE="$REPO_ROOT/CHANGELOG.md"
|
|
DIST_DIR="$REPO_ROOT/dist"
|
|
|
|
NEW_VERSION="${1:-}"
|
|
if [ -z "$NEW_VERSION" ]; then
|
|
echo "usage: $0 <new-version>" >&2
|
|
exit 1
|
|
fi
|
|
|
|
if ! [[ "$NEW_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
|
echo "!! <new-version> must be plain SemVer (X.Y.Z), got: $NEW_VERSION" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# The GitHub Release tag/URL this release's assets will be published under.
|
|
# Must match whatever .github/workflows/release.yml actually creates the
|
|
# release as (tag "v<version>") — see that workflow for the release job.
|
|
RELEASE_TAG="v$NEW_VERSION"
|
|
REPO_SLUG="${GITHUB_REPOSITORY:-OWNER/unraid-podman}"
|
|
RELEASE_BASE_URL="https://github.com/$REPO_SLUG/releases/download/$RELEASE_TAG"
|
|
|
|
# Component name -> the entity name prefix used in podman.plg. Must match
|
|
# plugin/podman.plg's <!ENTITY NAME_txz_...> declarations exactly.
|
|
# catatonit, nftables, and docker-compose are vendored runtime
|
|
# dependencies (not built from source, see their own packages/*/README.md)
|
|
# and unraid-podman is the plugin's own scaffolding package (see
|
|
# packages/unraid-podman/README.md), not an upstream component, but all
|
|
# four are released and entity-updated exactly like the seven upstream ones.
|
|
COMPONENTS=(podman conmon crun netavark aardvark-dns passt fuse-overlayfs catatonit nftables docker-compose unraid-podman)
|
|
|
|
echo "==> Releasing unraid-podman plugin v$NEW_VERSION (packages tag: $RELEASE_TAG)"
|
|
|
|
# --- 1. Build ----------------------------------------------------------------
|
|
if [ "${SKIP_BUILD:-0}" != "1" ]; then
|
|
echo "==> Building all packages"
|
|
"$REPO_ROOT/scripts/build-packages.sh"
|
|
else
|
|
echo "==> SKIP_BUILD=1, assuming $DIST_DIR is already populated"
|
|
fi
|
|
|
|
"$REPO_ROOT/scripts/checksums.sh" "$DIST_DIR"
|
|
|
|
# --- 2. Update plugin version entity ------------------------------------------
|
|
echo "==> Setting <!ENTITY version> to $NEW_VERSION in $PLG_FILE"
|
|
sed -i -E "s|(<!ENTITY version[[:space:]]+\")[^\"]*(\">)|\1${NEW_VERSION}\2|" "$PLG_FILE"
|
|
sed -i -E "s|(<!ENTITY baseURL[[:space:]]+\")[^\"]*(\">)|\1${RELEASE_BASE_URL}\2|" "$PLG_FILE"
|
|
|
|
# --- 3. Update per-package entities from dist/*.txz.md5 -----------------------
|
|
for name in "${COMPONENTS[@]}"; do
|
|
# dist/ contains files like podman-6.0.1-x86_64-1_unraidpodman.txz — find
|
|
# the one for this component (there should be exactly one per release).
|
|
txz_path=$(find "$DIST_DIR" -maxdepth 1 -name "${name}-*-*-*.txz" | head -n1)
|
|
if [ -z "$txz_path" ]; then
|
|
echo "!! No built .txz found for component '$name' in $DIST_DIR" >&2
|
|
echo "!! Did scripts/build-packages.sh run successfully for it?" >&2
|
|
exit 1
|
|
fi
|
|
|
|
txz_file=$(basename "$txz_path")
|
|
md5_path="$txz_path.md5"
|
|
if [ ! -f "$md5_path" ]; then
|
|
echo "!! Missing $md5_path" >&2
|
|
exit 1
|
|
fi
|
|
md5=$(awk '{print $1}' "$md5_path")
|
|
|
|
# Component version is everything between "<name>-" and the next "-<arch>-"
|
|
# e.g. "podman-6.0.1-x86_64-1_unraidpodman.txz" -> "6.0.1"
|
|
txz_version=$(echo "$txz_file" | sed -E "s/^${name}-(.+)-[^-]+-[0-9]+[^-]*\.txz\$/\1/")
|
|
|
|
entity_prefix=$(echo "$name" | tr '-' '_')
|
|
|
|
echo "==> [$name] $txz_file (md5=$md5)"
|
|
sed -i -E "s|(<!ENTITY ${entity_prefix}_txz_version[[:space:]]+\")[^\"]*(\">)|\1${txz_version}\2|" "$PLG_FILE"
|
|
sed -i -E "s|(<!ENTITY ${entity_prefix}_txz_file[[:space:]]+\")[^\"]*(\">)|\1${txz_file}\2|" "$PLG_FILE"
|
|
sed -i -E "s|(<!ENTITY ${entity_prefix}_txz_md5[[:space:]]+\")[^\"]*(\">)|\1${md5}\2|" "$PLG_FILE"
|
|
done
|
|
|
|
# --- 4. Update CHANGELOG.md ---------------------------------------------------
|
|
# Pure awk (no python/perl dependency — this script also has to run inside
|
|
# the minimal Slackware build container, see .github/workflows/release.yml):
|
|
# inserts a fresh "## [<version>] - <date>" heading right after the existing
|
|
# "## [Unreleased]" marker, leaving [Unreleased] itself empty and at the top
|
|
# for the next round of changes.
|
|
echo "==> Moving CHANGELOG.md [Unreleased] section under [$NEW_VERSION]"
|
|
TODAY=$(date -u +%Y-%m-%d)
|
|
|
|
if ! grep -q '^## \[Unreleased\]$' "$CHANGELOG_FILE"; then
|
|
echo "!! No '## [Unreleased]' heading found in $CHANGELOG_FILE" >&2
|
|
exit 1
|
|
fi
|
|
|
|
awk -v ver="$NEW_VERSION" -v date="$TODAY" '
|
|
!done && $0 == "## [Unreleased]" {
|
|
print $0
|
|
print ""
|
|
print "## [" ver "] - " date
|
|
done = 1
|
|
next
|
|
}
|
|
{ print $0 }
|
|
' "$CHANGELOG_FILE" > "$CHANGELOG_FILE.tmp"
|
|
mv "$CHANGELOG_FILE.tmp" "$CHANGELOG_FILE"
|
|
|
|
echo
|
|
echo "==> Release preparation complete for v$NEW_VERSION."
|
|
echo "==> Review the diff, then:"
|
|
echo " git add plugin/podman.plg CHANGELOG.md"
|
|
echo " git commit -m \"release: v$NEW_VERSION\""
|
|
echo " git tag $RELEASE_TAG"
|
|
echo " git push && git push origin $RELEASE_TAG"
|
|
echo "==> Pushing the tag triggers .github/workflows/release.yml, which"
|
|
echo "==> rebuilds artifacts in CI (for reproducibility/provenance) and"
|
|
echo "==> publishes the GitHub Release with dist/*.txz + CHECKSUMS.* + the"
|
|
echo "==> updated podman.plg attached."
|