Skip to content

Commit 1f055a3

Browse files
authored
Merge branch 'firecracker-microvm:main' into aarch64-max-dev
2 parents ef69e07 + 931a233 commit 1f055a3

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vmm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ timerfd = "1.5.0"
4444
userfaultfd = "0.8.1"
4545
utils = { path = "../utils" }
4646
vhost = { version = "0.14.0", features = ["vhost-user-frontend"] }
47-
vm-allocator = "0.1.2"
47+
vm-allocator = "0.1.3"
4848
vm-memory = { version = "0.16.2", features = ["backend-mmap", "backend-bitmap"] }
4949
vm-superio = "0.8.0"
5050
vmm-sys-util = { version = "0.14.0", features = ["with-serde"] }

tools/test-popular-containers/build_rootfs.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ function make_rootfs {
1414
local rootfs=$LABEL
1515
local IMG=$LABEL.ext4
1616
mkdir $LABEL
17-
ctr image pull docker.io/library/$LABEL
18-
ctr image mount --rw docker.io/library/$LABEL $LABEL
17+
ctr image pull public.ecr.aws/docker/library/$LABEL
18+
ctr image mount --rw public.ecr.aws/docker/library/$LABEL $LABEL
1919
MNT_SIZE=$(du -sb $LABEL |cut -f1)
2020
SIZE=$(( $MNT_SIZE + 512 * 2**20 ))
2121

@@ -75,6 +75,6 @@ EOF
7575
make_rootfs alpine:latest
7676
make_rootfs ubuntu:22.04
7777
make_rootfs ubuntu:24.04
78-
make_rootfs ubuntu:24.10
79-
# make_rootfs ubuntu:latest
78+
make_rootfs ubuntu:25.04
79+
make_rootfs ubuntu:latest
8080
make_rootfs amazonlinux:2023

0 commit comments

Comments
 (0)