From 76fc6aa044ba9356d214ddffb539cdbbfd22d7d0 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Mon, 25 Nov 2024 11:36:42 +0100 Subject: [PATCH] docker(install): update lima images to ubuntu 24.04 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- __tests__/docker/install.test.itg.ts | 15 +-------------- src/docker/assets.ts | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/__tests__/docker/install.test.itg.ts b/__tests__/docker/install.test.itg.ts index b960e77a..00cdb97f 100644 --- a/__tests__/docker/install.test.itg.ts +++ b/__tests__/docker/install.test.itg.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {jest, describe, test, beforeEach, afterEach, expect} from '@jest/globals'; +import {describe, test, expect} from '@jest/globals'; import fs from 'fs'; import os from 'os'; import path from 'path'; @@ -26,19 +26,6 @@ import {Exec} from '../../src/exec'; const tmpDir = () => fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'docker-install-itg-')); describe('install', () => { - const originalEnv = process.env; - beforeEach(() => { - jest.resetModules(); - process.env = { - ...originalEnv, - LIMA_START_ARGS: '--cpus 4 --memory 8', - LIMA_IMAGES: `x86_64:https://cloud.debian.org/images/cloud/bookworm/20231013-1532/debian-12-genericcloud-amd64-20231013-1532.qcow2@sha512:6b55e88b027c14da1b55c85a25a9f7069d4560a8fdb2d948c986a585db469728a06d2c528303e34bb62d8b2984def38fd9ddfc00965846ff6e05b01d6e883bfe -aarch64:https://cloud.debian.org/images/cloud/bookworm/20231013-1532/debian-12-genericcloud-arm64-20231013-1532.qcow2` - }; - }); - afterEach(() => { - process.env = originalEnv; - }); // prettier-ignore test.each([ {type: 'image', tag: '27.3.1'} as InstallSourceImage, diff --git a/src/docker/assets.ts b/src/docker/assets.ts index 49d25636..80b46e17 100644 --- a/src/docker/assets.ts +++ b/src/docker/assets.ts @@ -132,6 +132,8 @@ Get-WinEvent -ea SilentlyContinue \` `; export const limaYamlData = ` +# Source: https://github.com/lima-vm/lima/blob/master/templates/docker-rootful.yaml + # VM type: "qemu" or "vz" (on macOS 13 and later). # The vmType can be specified only on creating the instance. # The vmType of existing instances cannot be changed. @@ -152,12 +154,18 @@ images: arch: "{{arch}}" digest: "{{digest}}" {{/each}} -- location: "https://cloud-images.ubuntu.com/releases/22.04/release-20231026/ubuntu-22.04-server-cloudimg-amd64.img" +- location: "https://cloud-images.ubuntu.com/releases/24.04/release-20241004/ubuntu-24.04-server-cloudimg-amd64.img" + arch: "x86_64" + digest: "sha256:fad101d50b06b26590cf30542349f9e9d3041ad7929e3bc3531c81ec27f2c788" +- location: "https://cloud-images.ubuntu.com/releases/24.04/release-20241004/ubuntu-24.04-server-cloudimg-arm64.img" + arch: "aarch64" + digest: "sha256:e380b683b0c497d2a87af8a5dbe94c42eb54548fa976167f307ed8cf3944ec57" +# Fallback to the latest release image. +# Hint: run \`limactl prune\` to invalidate the cache +- location: "https://cloud-images.ubuntu.com/releases/24.04/release/ubuntu-24.04-server-cloudimg-amd64.img" arch: "x86_64" - digest: "sha256:054db2d88c454bb0ad8dfd8883955e3946b57d2b0bf0d023f3ade3c93cdd14e5" -- location: "https://cloud-images.ubuntu.com/releases/22.04/release-20231026/ubuntu-22.04-server-cloudimg-arm64.img" +- location: "https://cloud-images.ubuntu.com/releases/24.04/release/ubuntu-24.04-server-cloudimg-arm64.img" arch: "aarch64" - digest: "sha256:eafa7742ce5ff109222ea313d31ea366d587b4e89b900b11d8285ae775dfe8c3" # CPUs # Builtin default: min(4, host CPU cores)