Skip to content

Commit 76fc6aa

Browse files
committed
docker(install): update lima images to ubuntu 24.04
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
1 parent d99f9fd commit 76fc6aa

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

__tests__/docker/install.test.itg.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import {jest, describe, test, beforeEach, afterEach, expect} from '@jest/globals';
17+
import {describe, test, expect} from '@jest/globals';
1818
import fs from 'fs';
1919
import os from 'os';
2020
import path from 'path';
@@ -26,19 +26,6 @@ import {Exec} from '../../src/exec';
2626
const tmpDir = () => fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'docker-install-itg-'));
2727

2828
describe('install', () => {
29-
const originalEnv = process.env;
30-
beforeEach(() => {
31-
jest.resetModules();
32-
process.env = {
33-
...originalEnv,
34-
LIMA_START_ARGS: '--cpus 4 --memory 8',
35-
LIMA_IMAGES: `x86_64:https://cloud.debian.org/images/cloud/bookworm/20231013-1532/debian-12-genericcloud-amd64-20231013-1532.qcow2@sha512:6b55e88b027c14da1b55c85a25a9f7069d4560a8fdb2d948c986a585db469728a06d2c528303e34bb62d8b2984def38fd9ddfc00965846ff6e05b01d6e883bfe
36-
aarch64:https://cloud.debian.org/images/cloud/bookworm/20231013-1532/debian-12-genericcloud-arm64-20231013-1532.qcow2`
37-
};
38-
});
39-
afterEach(() => {
40-
process.env = originalEnv;
41-
});
4229
// prettier-ignore
4330
test.each([
4431
{type: 'image', tag: '27.3.1'} as InstallSourceImage,

src/docker/assets.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ Get-WinEvent -ea SilentlyContinue \`
132132
`;
133133

134134
export const limaYamlData = `
135+
# Source: https://github.com/lima-vm/lima/blob/master/templates/docker-rootful.yaml
136+
135137
# VM type: "qemu" or "vz" (on macOS 13 and later).
136138
# The vmType can be specified only on creating the instance.
137139
# The vmType of existing instances cannot be changed.
@@ -152,12 +154,18 @@ images:
152154
arch: "{{arch}}"
153155
digest: "{{digest}}"
154156
{{/each}}
155-
- location: "https://cloud-images.ubuntu.com/releases/22.04/release-20231026/ubuntu-22.04-server-cloudimg-amd64.img"
157+
- location: "https://cloud-images.ubuntu.com/releases/24.04/release-20241004/ubuntu-24.04-server-cloudimg-amd64.img"
158+
arch: "x86_64"
159+
digest: "sha256:fad101d50b06b26590cf30542349f9e9d3041ad7929e3bc3531c81ec27f2c788"
160+
- location: "https://cloud-images.ubuntu.com/releases/24.04/release-20241004/ubuntu-24.04-server-cloudimg-arm64.img"
161+
arch: "aarch64"
162+
digest: "sha256:e380b683b0c497d2a87af8a5dbe94c42eb54548fa976167f307ed8cf3944ec57"
163+
# Fallback to the latest release image.
164+
# Hint: run \`limactl prune\` to invalidate the cache
165+
- location: "https://cloud-images.ubuntu.com/releases/24.04/release/ubuntu-24.04-server-cloudimg-amd64.img"
156166
arch: "x86_64"
157-
digest: "sha256:054db2d88c454bb0ad8dfd8883955e3946b57d2b0bf0d023f3ade3c93cdd14e5"
158-
- location: "https://cloud-images.ubuntu.com/releases/22.04/release-20231026/ubuntu-22.04-server-cloudimg-arm64.img"
167+
- location: "https://cloud-images.ubuntu.com/releases/24.04/release/ubuntu-24.04-server-cloudimg-arm64.img"
159168
arch: "aarch64"
160-
digest: "sha256:eafa7742ce5ff109222ea313d31ea366d587b4e89b900b11d8285ae775dfe8c3"
161169
162170
# CPUs
163171
# Builtin default: min(4, host CPU cores)

0 commit comments

Comments
 (0)