From 8b2680434d14e7766c4169e639d89bdcaa3c7a35 Mon Sep 17 00:00:00 2001 From: ergosteur <1992147+ergosteur@users.noreply.github.com> Date: Fri, 7 Aug 2026 16:04:41 +0000 Subject: [PATCH] Track the Alpine cloud image prefix as a pin Alpine renamed the prefix from nocloud_ to generic_ in 3.24, which was hardcoded in the URL and so had to be edited by hand alongside the version bump. As a pin it sits with the other values a release bump touches, and update-image-pins.sh can read the real prefix off the mirror rather than assuming one. No change to the URL produced: still generic_ for the pinned 3.24.1. Co-Authored-By: Claude Opus 5 (1M context) --- build-cloudinit-template.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build-cloudinit-template.sh b/build-cloudinit-template.sh index 9332e67..2f82d3c 100755 --- a/build-cloudinit-template.sh +++ b/build-cloudinit-template.sh @@ -34,6 +34,9 @@ fi # --- Distribution version pins (update these over time) --- ALPINE_MAJOR="v3.24" ALPINE_PATCH="3.24.1" +# Upstream renamed the cloud image prefix from nocloud_ to generic_ in 3.24, so +# this tracks the branch: generic_ for 3.24+, nocloud_ for 3.23 and older. +ALPINE_PREFIX="generic" UBUNTU_CODENAME="resolute" # 26.04 LTS UBUNTU_VER="2604" DEBIAN_CODENAME="trixie" @@ -121,9 +124,7 @@ fi case $DISTRO_CHOICE in alpine) VM_NAME="alpine-${ALPINE_MAJOR//v/}-cloudinit" - # Upstream renamed the cloud image prefix from nocloud_ to generic_ in 3.24; - # 3.23 and older only have nocloud_, so this URL is not backward-compatible. - IMAGE_URL="https://dl-cdn.alpinelinux.org/alpine/${ALPINE_MAJOR}/releases/cloud/generic_alpine-${ALPINE_PATCH}-x86_64-uefi-cloudinit-r0.qcow2" + IMAGE_URL="https://dl-cdn.alpinelinux.org/alpine/${ALPINE_MAJOR}/releases/cloud/${ALPINE_PREFIX}_alpine-${ALPINE_PATCH}-x86_64-uefi-cloudinit-r0.qcow2" DEFAULT_DISK_SIZE="8G" PKG_MGR="apk" ;;