github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-12-14 19:49:33 +00:00
Code Issues Projects Releases Wiki Activity

update qemu to solve slow builds using qemu binfmt

Browse Source 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher
2025-12-04 15:03:08 +02:00
committed by Avi Deitcher
parent a2753b8da3
commit c4e3043089
4 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/docker-for-mac.yml
View File

@@ -17,7 +17,7 @@ onboot:
- name: sysfs
image: linuxkit/sysfs:6d5bd933762f6b216744c711c6e876756cee9600
- name: binfmt
image: linuxkit/binfmt:594ef260c28aa6d85273b8f08ba3076d340c54d7
image: linuxkit/binfmt:4924dc6b9aa7e0bcc6fe8825c24471eac4684108
# Format and mount the disk image in /var/lib/docker
- name: format
image: linuxkit/format:4f779c0b0d0ba145b7f03211b5cbf59fbbe12e54

13
pkg/binfmt/Dockerfile
View File

@@ -1,13 +1,6 @@
# Use Debian testing Qemu 4.2.0 until https://bugs.alpinelinux.org/issues/8131 is resolved.
FROM debian@sha256:731dd1380d6a8d170a695dbeb17fe0eade0e1c29f654cf0a3a07f372191c3f4b AS qemu
RUN apt-get update && apt-get install -y qemu-user-static && \
mv /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64 && \
mv /usr/bin/qemu-arm-static /usr/bin/qemu-arm && \
mv /usr/bin/qemu-ppc64le-static /usr/bin/qemu-ppc64le && \
mv /usr/bin/qemu-s390x-static /usr/bin/qemu-s390x && \
mv /usr/bin/qemu-riscv64-static /usr/bin/qemu-riscv64 && \
mv /usr/bin/qemu-loongarch64-static /usr/bin/qemu-loongarch64 && \
rm /usr/bin/qemu-*-static
# Use Debian testing-slim Qemu 4.2.0 until https://bugs.alpinelinux.org/issues/8131 is resolved.
FROM debian@sha256:80381085775a6e69f0f8d09dd9a39495063e348382eb8d4881ba6f142d24b8ab AS qemu
RUN apt-get update && apt-get install -y qemu-user-static
FROM linuxkit/alpine:7f3944798557de5518a56e3437d7ed982701f224 AS mirror

2
test/cases/040_packages/002_binfmt/test.sh
View File

@@ -17,7 +17,7 @@ trap clean_up EXIT
# Test code goes here
linuxkit build --format kernel+initrd --name "${NAME}" test.yml
RESULT="$(linuxkitrun ${NAME})"
RESULT="$(linuxkitrun --mem 2048 ${NAME})"
echo "${RESULT}"
echo "${RESULT}" | grep -q "suite PASSED"

2
test/cases/040_packages/002_binfmt/test.yml
View File

@@ -6,7 +6,7 @@ init:
- linuxkit/runc:3c079dfa25a05653db203c2abfb329c4e08ba6f9
onboot:
- name: binfmt
image: linuxkit/binfmt:594ef260c28aa6d85273b8f08ba3076d340c54d7
image: linuxkit/binfmt:4924dc6b9aa7e0bcc6fe8825c24471eac4684108
- name: test
image: alpine:3.13
binds: