From 2f16026b2859de904b4c06d17d4e86dd519a5021 Mon Sep 17 00:00:00 2001 From: Abiola Ibrahim Date: Tue, 5 May 2026 10:46:19 +0100 Subject: [PATCH] core: update disk images Signed-off-by: Abiola Ibrahim --- embedded/images/images.txt | 16 ++++++++-------- embedded/images/images_sha.sh | 12 ++++++------ environment/vm/lima/limaconfig/config.go | 4 ++++ environment/vm/lima/limautil/image.go | 4 ++-- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/embedded/images/images.txt b/embedded/images/images.txt index 53ea401..0708996 100644 --- a/embedded/images/images.txt +++ b/embedded/images/images.txt @@ -1,8 +1,8 @@ -arm64 none https://github.com/abiosoft/colima-core/releases/download/v0.10.2/ubuntu-24.04-minimal-cloudimg-arm64-none.qcow2 1e9834350069e2b6ed2be3b03baf8d72fc228a5ebb0c17edb37787509e4ce3abfa2f59c76fe6674d81dffd6e4af943b8376da072bf2ebc98c5116264ee351864 ubuntu-24.04-minimal-cloudimg-arm64-none.qcow2 -arm64 docker https://github.com/abiosoft/colima-core/releases/download/v0.10.2/ubuntu-24.04-minimal-cloudimg-arm64-docker.qcow2 d10796bf7d4a41a8507c37f52037e4c4fbfadd7b1a537a889a440cd051d0f77fc54059a44438e897b130934f6aaddf1e2b62cfea9a935d9de4cb69337989bf16 ubuntu-24.04-minimal-cloudimg-arm64-docker.qcow2 -arm64 containerd https://github.com/abiosoft/colima-core/releases/download/v0.10.2/ubuntu-24.04-minimal-cloudimg-arm64-containerd.qcow2 00a50e6ede0697e34ef800215f2fcd48bd188560ea81ac46cb5b0d7f6a00c0f4450eca202586a7a7354280d4fdf0abe8f792f6396d0fbe21badd2733627d0a0d ubuntu-24.04-minimal-cloudimg-arm64-containerd.qcow2 -arm64 incus https://github.com/abiosoft/colima-core/releases/download/v0.10.2/ubuntu-24.04-minimal-cloudimg-arm64-incus.qcow2 42822b5e223f9e5e5f6931ac3f9a78286128649fc650d6643810e3c494541b1a9cc1e36f7fc0e17a1059dee79c14ea86ca004a3626fc918a3c2de1c40a3e5638 ubuntu-24.04-minimal-cloudimg-arm64-incus.qcow2 -amd64 none https://github.com/abiosoft/colima-core/releases/download/v0.10.2/ubuntu-24.04-minimal-cloudimg-amd64-none.qcow2 153988fe84f338cec399481e0942e1556423223ac4073fa6ac16a65cb510c902a833ffa1a43885fcdb07bca7235a8a3743b0328de3bc147313375867131ae5bc ubuntu-24.04-minimal-cloudimg-amd64-none.qcow2 -amd64 docker https://github.com/abiosoft/colima-core/releases/download/v0.10.2/ubuntu-24.04-minimal-cloudimg-amd64-docker.qcow2 1658ce5b52f63bd59c333c8bc3c3e9583ebc154f13f8eecff9a19e8b56687a9f92aa5535efd648e11532d699f51e39776a9e5fa31f5e631349429df2ff3178f1 ubuntu-24.04-minimal-cloudimg-amd64-docker.qcow2 -amd64 containerd https://github.com/abiosoft/colima-core/releases/download/v0.10.2/ubuntu-24.04-minimal-cloudimg-amd64-containerd.qcow2 ffa2b632425525994e708e988f930cc2ea50763bf13b6b08cf26b8d899b69bd4595270fe548d0ae3119772dc3d2b4e9f47451a623e163962633084e3714113a5 ubuntu-24.04-minimal-cloudimg-amd64-containerd.qcow2 -amd64 incus https://github.com/abiosoft/colima-core/releases/download/v0.10.2/ubuntu-24.04-minimal-cloudimg-amd64-incus.qcow2 dbe8e35cdd4262b877728ffe2990c46ce6ede258da3a65eab7d09df83a76ebc2bc57bba0cce75fec1c3b24f4a49b3f9a844ce14a1d1734df21e790d0cfa33a6c ubuntu-24.04-minimal-cloudimg-amd64-incus.qcow2 +arm64 none https://github.com/abiosoft/colima-core/releases/download/v0.10.3/ubuntu-24.04-minimal-cloudimg-arm64-none.raw.gz b82c68d17289035c9adae94510049ae75820f9c9e4fa9b6c05fbf45d32f64fdeff5d604b61cb2eebb59036eacb5b606260561b29fc8d78a13cd69f4e7d6361d0 ubuntu-24.04-minimal-cloudimg-arm64-none.raw.gz +arm64 docker https://github.com/abiosoft/colima-core/releases/download/v0.10.3/ubuntu-24.04-minimal-cloudimg-arm64-docker.raw.gz 94bfe6f35f34e5b4b8a8d6f3c0e2c247f8c3abd4f520fde593b7dd7e83693076441c5b8eb66003437058c57db87727cea3c3c822b867d1ed071953402882f16c ubuntu-24.04-minimal-cloudimg-arm64-docker.raw.gz +arm64 containerd https://github.com/abiosoft/colima-core/releases/download/v0.10.3/ubuntu-24.04-minimal-cloudimg-arm64-containerd.raw.gz fd8631154c94f57055a9e4a0cdacf65bb6da719f9f0bc5dadfb3e6373b29eb2f75988121f513e78ceb190a91fed38293fb9a32be7cf2fdc8cc97b11e6194aacd ubuntu-24.04-minimal-cloudimg-arm64-containerd.raw.gz +arm64 incus https://github.com/abiosoft/colima-core/releases/download/v0.10.3/ubuntu-24.04-minimal-cloudimg-arm64-incus.raw.gz ea9011b688d89e0aa962fbfd56993ee4a5e879e4de1b246dff7db7d3e087c3162837be1a8f506243106fe2deaf18aac162bb8fd39e469f46e8e39090d3caaa13 ubuntu-24.04-minimal-cloudimg-arm64-incus.raw.gz +amd64 none https://github.com/abiosoft/colima-core/releases/download/v0.10.3/ubuntu-24.04-minimal-cloudimg-amd64-none.raw.gz eb30939f73d138f7e014dccdf01e4a5ae6d94b2f8c7689150304552553ffd86f181336c08a8d0fd1b54fdc07fa9d3c835c281f5d25d2baa43b40f5ed6a8ab9df ubuntu-24.04-minimal-cloudimg-amd64-none.raw.gz +amd64 docker https://github.com/abiosoft/colima-core/releases/download/v0.10.3/ubuntu-24.04-minimal-cloudimg-amd64-docker.raw.gz 3576c90cf4fd449cfcf8a52bebb0e092dc803cba3acd6e50a27675f5e1e42930a7197c74b0875467c1df9a637e463bd84a80a5927ac0e2f68f3f5bdaf10b01d5 ubuntu-24.04-minimal-cloudimg-amd64-docker.raw.gz +amd64 containerd https://github.com/abiosoft/colima-core/releases/download/v0.10.3/ubuntu-24.04-minimal-cloudimg-amd64-containerd.raw.gz 41fbf5c61cb2ea166711158db66399084632ca5c821880982e855432a41ec2a6b0ef0049e57be29b72f69118ea635f3af5850f5f9f888f9a6c8263c18e109bc5 ubuntu-24.04-minimal-cloudimg-amd64-containerd.raw.gz +amd64 incus https://github.com/abiosoft/colima-core/releases/download/v0.10.3/ubuntu-24.04-minimal-cloudimg-amd64-incus.raw.gz dcffef5cf8a06d09744837e6f593b7c35c2e2ea381d5ed650873762e82791b0755a5f205968325d76a1ad1b6de835aecfb7e533aedbd466b954e5c3933046e22 ubuntu-24.04-minimal-cloudimg-amd64-incus.raw.gz diff --git a/embedded/images/images_sha.sh b/embedded/images/images_sha.sh index 5c85f6c..fe22f9e 100644 --- a/embedded/images/images_sha.sh +++ b/embedded/images/images_sha.sh @@ -4,7 +4,7 @@ set -eux BASE_URL=https://github.com/abiosoft/colima-core/releases/download BASE_FILENAME=ubuntu-24.04-minimal-cloudimg -VERSION=v0.10.2 +VERSION=v0.10.3 RUNTIMES="none docker containerd incus" ARCHS="arm64 amd64" @@ -15,9 +15,9 @@ FILE="${DIR}/images.txt" echo -n >$FILE for arch in ${ARCHS}; do - for runtime in ${RUNTIMES}; do - URL="${BASE_URL}/${VERSION}/${BASE_FILENAME}-${arch}-${runtime}.qcow2" - SHA="$(curl -sL ${URL}.sha512sum)" - echo "$arch $runtime ${URL} ${SHA}" >>$FILE - done + for runtime in ${RUNTIMES}; do + URL="${BASE_URL}/${VERSION}/${BASE_FILENAME}-${arch}-${runtime}.raw.gz" + SHA="$(curl -sL ${URL}.sha512sum)" + echo "$arch $runtime ${URL} ${SHA}" >>$FILE + done done diff --git a/environment/vm/lima/limaconfig/config.go b/environment/vm/lima/limaconfig/config.go index d691739..b4ba2d7 100644 --- a/environment/vm/lima/limaconfig/config.go +++ b/environment/vm/lima/limaconfig/config.go @@ -2,6 +2,7 @@ package limaconfig import ( "net" + "strings" "github.com/abiosoft/colima/environment" ) @@ -38,6 +39,9 @@ type File struct { Digest string `yaml:"digest,omitempty"` } +// Compressed returns if the file is gzipped, detected with the .gz suffix. +func (f File) Compressed() bool { return strings.HasSuffix(f.Location, ".gz") } + type Mount struct { Location string `yaml:"location"` // REQUIRED MountPoint string `yaml:"mountPoint,omitempty"` diff --git a/environment/vm/lima/limautil/image.go b/environment/vm/lima/limautil/image.go index 62b8058..3fb1502 100644 --- a/environment/vm/lima/limautil/image.go +++ b/environment/vm/lima/limautil/image.go @@ -74,8 +74,8 @@ func DownloadImage(arch environment.Arch, runtime string) (f limaconfig.File, er diskImage := diskImageFile(qcow2) - // if qemu-img is missing, ignore raw conversion - if err := util.AssertQemuImg(); err != nil { + // if qemu-img is missing or the image is zstd, ignore raw conversion + if err := util.AssertQemuImg(); err != nil || img.Compressed() { img.Location = diskImage.String() img.Digest = "" // remove digest return img, nil