diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 3cd69b1..674ea78 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -4,7 +4,7 @@ # Runs on ARM64 self-hosted runner (ASUS GX10) # # Produces: -# - Installer container image → Docker Hub (svrnty/installer:) +# - Installer container image → Docker Hub (svrnty/talos-rpi5:) # - Raw disk image → Gitea release (metal-arm64.raw.zst) name: Build Talos CM5 Image @@ -83,7 +83,7 @@ jobs: ## Artifacts - `metal-arm64.raw.zst` — Raw disk image for eMMC flashing - - `docker.io/svrnty/installer:${{ steps.version.outputs.tag }}` — Installer image for `talosctl upgrade` + - `docker.io/svrnty/talos-rpi5:${{ steps.version.outputs.tag }}` — Installer image for `talosctl upgrade` ## Usage ```bash @@ -91,7 +91,7 @@ jobs: ./scripts/flash-emmc.sh metal-arm64.raw.zst # Upgrade existing node - talosctl upgrade --image docker.io/svrnty/installer:${{ steps.version.outputs.tag }} + talosctl upgrade --image docker.io/svrnty/talos-rpi5:${{ steps.version.outputs.tag }} ``` release-dir: . release-notes-assistant: none diff --git a/Makefile b/Makefile index 54a6280..97425ba 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,9 @@ REGISTRY_USERNAME ?= svrnty TAG ?= $(shell git describe --tags --exact-match 2>/dev/null || echo dev) +# Public image name on Docker Hub (used by talosctl upgrade) +IMAGE_NAME ?= talos-rpi5 + # System extensions baked into the image EXTENSIONS ?= ghcr.io/siderolabs/iscsi-tools:v0.1.6 ghcr.io/siderolabs/util-linux-tools:2.40.4 @@ -139,8 +142,8 @@ installer: .PHONY: release release: docker pull $(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TALOS_TAG) && \ - docker tag $(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TALOS_TAG) $(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TAG) && \ - docker push $(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TAG) + docker tag $(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TALOS_TAG) $(REGISTRY)/$(REGISTRY_USERNAME)/$(IMAGE_NAME):$(TAG) && \ + docker push $(REGISTRY)/$(REGISTRY_USERNAME)/$(IMAGE_NAME):$(TAG) # # Clean diff --git a/README.md b/README.md index 56ca283..553f6ff 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The official Talos Image Factory does not support CM5 — the mainline kernel la ## What it builds -- **Installer image** → `docker.io/svrnty/installer:` (for `talosctl upgrade`) +- **Installer image** → `docker.io/svrnty/talos-rpi5:` (for `talosctl upgrade`) - **Raw disk image** → Gitea release `metal-arm64.raw.zst` (for eMMC flashing) Baked-in config: