github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3515 from justincormack/qemu-up

Browse Source 
Update to Qemu 4.2.0 from Debian testing
This commit is contained in:
Rolf Neugebauer 2020-05-06 23:27:53 +01:00 committed by GitHub
commit dbcf2611a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats 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:697f996868d6625a78bbbefb199d7b6b6ae3533a
- name: binfmt
image: linuxkit/binfmt:94d59bc179c7a9155d8593a974d499352b70bfd5
image: linuxkit/binfmt:4ea3b9b0938cbd19834c096aa31ff475cc75d281
# Format and mount the disk image in /var/lib/docker
- name: format
image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96

4
pkg/binfmt/Dockerfile
View File

@ -1,5 +1,5 @@
# Use Debian stretch until https://bugs.alpinelinux.org/issues/8131 is resolved.
FROM debian@sha256:de3eac83cd481c04c5d6c7344cd7327625a1d8b2540e82a8231b5675cef0ae5f AS qemu
# Use Debian testing Qemu 4.2.0 until https://bugs.alpinelinux.org/issues/8131 is resolved.
FROM debian@sha256:79f148e13b4c596d4ad7fd617aba3630e37cf04f04538699341ed1267bd61a23 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 && \

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

@ -6,7 +6,7 @@ init:
- linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878
onboot:
- name: binfmt
image: linuxkit/binfmt:94d59bc179c7a9155d8593a974d499352b70bfd5
image: linuxkit/binfmt:4ea3b9b0938cbd19834c096aa31ff475cc75d281
- name: test
image: alpine:3.11
binds: