gnh1201/docker-qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #27 from tianon/bullseye

Browse Source 
Update to Debian Bullseye
This commit is contained in:
Tianon Gravi 2021-08-23 14:52:37 -07:00 committed by GitHub
commit faf1443aaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
5.0/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -eux; \ RUN set -eux; \
# add backports for (potentially) newer QEMU firmware packages # add backports for (potentially) newer QEMU firmware packages
@ -12,17 +12,18 @@ RUN set -eux; \
echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \ echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \
# and add APT pinning to ensure we don't accidentally get QEMU from Debian # and add APT pinning to ensure we don't accidentally get QEMU from Debian
{ \ { \
echo 'Package: qemu-efi-* ovmf'; \ echo 'Package: src:edk2'; \
echo 'Pin: release a=*-backports'; \ echo 'Pin: release a=*-backports'; \
echo 'Pin-Priority: 600'; \ echo 'Pin-Priority: 600'; \
echo; \ echo; \
echo 'Package: qemu*'; \ echo 'Package: src:qemu'; \
echo 'Pin: version *'; \ echo 'Pin: version *'; \
echo 'Pin-Priority: -10'; \ echo 'Pin-Priority: -10'; \
} > /etc/apt/preferences.d/qemu.pref; \ } > /etc/apt/preferences.d/qemu.pref; \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
ovmf \ ovmf \
ovmf-ia32 \
qemu-efi-aarch64 \ qemu-efi-aarch64 \
qemu-efi-arm \ qemu-efi-arm \
; \ ; \

7
5.0/Dockerfile.native
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -eux; \ RUN set -eux; \
# add backports for (potentially) newer QEMU firmware packages # add backports for (potentially) newer QEMU firmware packages
@ -12,11 +12,11 @@ RUN set -eux; \
echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \ echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \
# and add APT pinning to ensure we don't accidentally get QEMU from Debian # and add APT pinning to ensure we don't accidentally get QEMU from Debian
{ \ { \
echo 'Package: qemu-efi-* ovmf'; \ echo 'Package: src:edk2'; \
echo 'Pin: release a=*-backports'; \ echo 'Pin: release a=*-backports'; \
echo 'Pin-Priority: 600'; \ echo 'Pin-Priority: 600'; \
echo; \ echo; \
echo 'Package: qemu*'; \ echo 'Package: src:qemu'; \
echo 'Pin: version *'; \ echo 'Pin: version *'; \
echo 'Pin-Priority: -10'; \ echo 'Pin-Priority: -10'; \
} > /etc/apt/preferences.d/qemu.pref; \ } > /etc/apt/preferences.d/qemu.pref; \
@ -26,6 +26,7 @@ RUN set -eux; \
amd64) apt-get install -y --no-install-recommends ovmf ;; \ amd64) apt-get install -y --no-install-recommends ovmf ;; \
arm64) apt-get install -y --no-install-recommends qemu-efi-aarch64 ;; \ arm64) apt-get install -y --no-install-recommends qemu-efi-aarch64 ;; \
armel | armhf) apt-get install -y --no-install-recommends qemu-efi-arm ;; \ armel | armhf) apt-get install -y --no-install-recommends qemu-efi-arm ;; \
i386) apt-get install -y --no-install-recommends ovmf-ia32 ;; \
*) echo >&2 "warning: architecture '$arch' unknown 😅 (is there a 'QEMU firmware' package that should be installed here? likely candidates: https://packages.debian.org/source/$suite/edk2)" ;; \ *) echo >&2 "warning: architecture '$arch' unknown 😅 (is there a 'QEMU firmware' package that should be installed here? likely candidates: https://packages.debian.org/source/$suite/edk2)" ;; \
esac; \ esac; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

7
5.1/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -eux; \ RUN set -eux; \
# add backports for (potentially) newer QEMU firmware packages # add backports for (potentially) newer QEMU firmware packages
@ -12,17 +12,18 @@ RUN set -eux; \
echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \ echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \
# and add APT pinning to ensure we don't accidentally get QEMU from Debian # and add APT pinning to ensure we don't accidentally get QEMU from Debian
{ \ { \
echo 'Package: qemu-efi-* ovmf'; \ echo 'Package: src:edk2'; \
echo 'Pin: release a=*-backports'; \ echo 'Pin: release a=*-backports'; \
echo 'Pin-Priority: 600'; \ echo 'Pin-Priority: 600'; \
echo; \ echo; \
echo 'Package: qemu*'; \ echo 'Package: src:qemu'; \
echo 'Pin: version *'; \ echo 'Pin: version *'; \
echo 'Pin-Priority: -10'; \ echo 'Pin-Priority: -10'; \
} > /etc/apt/preferences.d/qemu.pref; \ } > /etc/apt/preferences.d/qemu.pref; \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
ovmf \ ovmf \
ovmf-ia32 \
qemu-efi-aarch64 \ qemu-efi-aarch64 \
qemu-efi-arm \ qemu-efi-arm \
; \ ; \

7
5.1/Dockerfile.native
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -eux; \ RUN set -eux; \
# add backports for (potentially) newer QEMU firmware packages # add backports for (potentially) newer QEMU firmware packages
@ -12,11 +12,11 @@ RUN set -eux; \
echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \ echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \
# and add APT pinning to ensure we don't accidentally get QEMU from Debian # and add APT pinning to ensure we don't accidentally get QEMU from Debian
{ \ { \
echo 'Package: qemu-efi-* ovmf'; \ echo 'Package: src:edk2'; \
echo 'Pin: release a=*-backports'; \ echo 'Pin: release a=*-backports'; \
echo 'Pin-Priority: 600'; \ echo 'Pin-Priority: 600'; \
echo; \ echo; \
echo 'Package: qemu*'; \ echo 'Package: src:qemu'; \
echo 'Pin: version *'; \ echo 'Pin: version *'; \
echo 'Pin-Priority: -10'; \ echo 'Pin-Priority: -10'; \
} > /etc/apt/preferences.d/qemu.pref; \ } > /etc/apt/preferences.d/qemu.pref; \
@ -26,6 +26,7 @@ RUN set -eux; \
amd64) apt-get install -y --no-install-recommends ovmf ;; \ amd64) apt-get install -y --no-install-recommends ovmf ;; \
arm64) apt-get install -y --no-install-recommends qemu-efi-aarch64 ;; \ arm64) apt-get install -y --no-install-recommends qemu-efi-aarch64 ;; \
armel | armhf) apt-get install -y --no-install-recommends qemu-efi-arm ;; \ armel | armhf) apt-get install -y --no-install-recommends qemu-efi-arm ;; \
i386) apt-get install -y --no-install-recommends ovmf-ia32 ;; \
*) echo >&2 "warning: architecture '$arch' unknown 😅 (is there a 'QEMU firmware' package that should be installed here? likely candidates: https://packages.debian.org/source/$suite/edk2)" ;; \ *) echo >&2 "warning: architecture '$arch' unknown 😅 (is there a 'QEMU firmware' package that should be installed here? likely candidates: https://packages.debian.org/source/$suite/edk2)" ;; \
esac; \ esac; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

7
5.2/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -eux; \ RUN set -eux; \
# add backports for (potentially) newer QEMU firmware packages # add backports for (potentially) newer QEMU firmware packages
@ -12,17 +12,18 @@ RUN set -eux; \
echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \ echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \
# and add APT pinning to ensure we don't accidentally get QEMU from Debian # and add APT pinning to ensure we don't accidentally get QEMU from Debian
{ \ { \
echo 'Package: qemu-efi-* ovmf'; \ echo 'Package: src:edk2'; \
echo 'Pin: release a=*-backports'; \ echo 'Pin: release a=*-backports'; \
echo 'Pin-Priority: 600'; \ echo 'Pin-Priority: 600'; \
echo; \ echo; \
echo 'Package: qemu*'; \ echo 'Package: src:qemu'; \
echo 'Pin: version *'; \ echo 'Pin: version *'; \
echo 'Pin-Priority: -10'; \ echo 'Pin-Priority: -10'; \
} > /etc/apt/preferences.d/qemu.pref; \ } > /etc/apt/preferences.d/qemu.pref; \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
ovmf \ ovmf \
ovmf-ia32 \
qemu-efi-aarch64 \ qemu-efi-aarch64 \
qemu-efi-arm \ qemu-efi-arm \
; \ ; \

7
5.2/Dockerfile.native
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -eux; \ RUN set -eux; \
# add backports for (potentially) newer QEMU firmware packages # add backports for (potentially) newer QEMU firmware packages
@ -12,11 +12,11 @@ RUN set -eux; \
echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \ echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \
# and add APT pinning to ensure we don't accidentally get QEMU from Debian # and add APT pinning to ensure we don't accidentally get QEMU from Debian
{ \ { \
echo 'Package: qemu-efi-* ovmf'; \ echo 'Package: src:edk2'; \
echo 'Pin: release a=*-backports'; \ echo 'Pin: release a=*-backports'; \
echo 'Pin-Priority: 600'; \ echo 'Pin-Priority: 600'; \
echo; \ echo; \
echo 'Package: qemu*'; \ echo 'Package: src:qemu'; \
echo 'Pin: version *'; \ echo 'Pin: version *'; \
echo 'Pin-Priority: -10'; \ echo 'Pin-Priority: -10'; \
} > /etc/apt/preferences.d/qemu.pref; \ } > /etc/apt/preferences.d/qemu.pref; \
@ -26,6 +26,7 @@ RUN set -eux; \
amd64) apt-get install -y --no-install-recommends ovmf ;; \ amd64) apt-get install -y --no-install-recommends ovmf ;; \
arm64) apt-get install -y --no-install-recommends qemu-efi-aarch64 ;; \ arm64) apt-get install -y --no-install-recommends qemu-efi-aarch64 ;; \
armel | armhf) apt-get install -y --no-install-recommends qemu-efi-arm ;; \ armel | armhf) apt-get install -y --no-install-recommends qemu-efi-arm ;; \
i386) apt-get install -y --no-install-recommends ovmf-ia32 ;; \
*) echo >&2 "warning: architecture '$arch' unknown 😅 (is there a 'QEMU firmware' package that should be installed here? likely candidates: https://packages.debian.org/source/$suite/edk2)" ;; \ *) echo >&2 "warning: architecture '$arch' unknown 😅 (is there a 'QEMU firmware' package that should be installed here? likely candidates: https://packages.debian.org/source/$suite/edk2)" ;; \
esac; \ esac; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

7
6.0/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -eux; \ RUN set -eux; \
# add backports for (potentially) newer QEMU firmware packages # add backports for (potentially) newer QEMU firmware packages
@ -12,17 +12,18 @@ RUN set -eux; \
echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \ echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \
# and add APT pinning to ensure we don't accidentally get QEMU from Debian # and add APT pinning to ensure we don't accidentally get QEMU from Debian
{ \ { \
echo 'Package: qemu-efi-* ovmf'; \ echo 'Package: src:edk2'; \
echo 'Pin: release a=*-backports'; \ echo 'Pin: release a=*-backports'; \
echo 'Pin-Priority: 600'; \ echo 'Pin-Priority: 600'; \
echo; \ echo; \
echo 'Package: qemu*'; \ echo 'Package: src:qemu'; \
echo 'Pin: version *'; \ echo 'Pin: version *'; \
echo 'Pin-Priority: -10'; \ echo 'Pin-Priority: -10'; \
} > /etc/apt/preferences.d/qemu.pref; \ } > /etc/apt/preferences.d/qemu.pref; \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
ovmf \ ovmf \
ovmf-ia32 \
qemu-efi-aarch64 \ qemu-efi-aarch64 \
qemu-efi-arm \ qemu-efi-arm \
; \ ; \

7
6.0/Dockerfile.native
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -eux; \ RUN set -eux; \
# add backports for (potentially) newer QEMU firmware packages # add backports for (potentially) newer QEMU firmware packages
@ -12,11 +12,11 @@ RUN set -eux; \
echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \ echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \
# and add APT pinning to ensure we don't accidentally get QEMU from Debian # and add APT pinning to ensure we don't accidentally get QEMU from Debian
{ \ { \
echo 'Package: qemu-efi-* ovmf'; \ echo 'Package: src:edk2'; \
echo 'Pin: release a=*-backports'; \ echo 'Pin: release a=*-backports'; \
echo 'Pin-Priority: 600'; \ echo 'Pin-Priority: 600'; \
echo; \ echo; \
echo 'Package: qemu*'; \ echo 'Package: src:qemu'; \
echo 'Pin: version *'; \ echo 'Pin: version *'; \
echo 'Pin-Priority: -10'; \ echo 'Pin-Priority: -10'; \
} > /etc/apt/preferences.d/qemu.pref; \ } > /etc/apt/preferences.d/qemu.pref; \
@ -26,6 +26,7 @@ RUN set -eux; \
amd64) apt-get install -y --no-install-recommends ovmf ;; \ amd64) apt-get install -y --no-install-recommends ovmf ;; \
arm64) apt-get install -y --no-install-recommends qemu-efi-aarch64 ;; \ arm64) apt-get install -y --no-install-recommends qemu-efi-aarch64 ;; \
armel | armhf) apt-get install -y --no-install-recommends qemu-efi-arm ;; \ armel | armhf) apt-get install -y --no-install-recommends qemu-efi-arm ;; \
i386) apt-get install -y --no-install-recommends ovmf-ia32 ;; \
*) echo >&2 "warning: architecture '$arch' unknown 😅 (is there a 'QEMU firmware' package that should be installed here? likely candidates: https://packages.debian.org/source/$suite/edk2)" ;; \ *) echo >&2 "warning: architecture '$arch' unknown 😅 (is there a 'QEMU firmware' package that should be installed here? likely candidates: https://packages.debian.org/source/$suite/edk2)" ;; \
esac; \ esac; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

10
Dockerfile.template
View File

@ -1,4 +1,4 @@
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -eux; \ RUN set -eux; \
# add backports for (potentially) newer QEMU firmware packages # add backports for (potentially) newer QEMU firmware packages
@ -6,11 +6,11 @@ RUN set -eux; \
echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \ echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \
# and add APT pinning to ensure we don't accidentally get QEMU from Debian # and add APT pinning to ensure we don't accidentally get QEMU from Debian
{ \ { \
echo 'Package: qemu-efi-* ovmf'; \ echo 'Package: src:edk2'; \
echo 'Pin: release a=*-backports'; \ echo 'Pin: release a=*-backports'; \
echo 'Pin-Priority: 600'; \ echo 'Pin-Priority: 600'; \
echo; \ echo; \
echo 'Package: qemu*'; \ echo 'Package: src:qemu'; \
echo 'Pin: version *'; \ echo 'Pin: version *'; \
echo 'Pin-Priority: -10'; \ echo 'Pin-Priority: -10'; \
} > /etc/apt/preferences.d/qemu.pref; \ } > /etc/apt/preferences.d/qemu.pref; \
@ -19,8 +19,8 @@ RUN set -eux; \
amd64: "ovmf", amd64: "ovmf",
arm64: "qemu-efi-aarch64", arm64: "qemu-efi-aarch64",
"armel | armhf": "qemu-efi-arm", "armel | armhf": "qemu-efi-arm",
# TODO add "i386": "ovmf-ia32" in bullseye+ i386: "ovmf-ia32",
# TODO in bullseye+, add u-boot-qemu ? https://packages.debian.org/bullseye/u-boot-qemu (not sure which arches to add this to since it contains all of them... maybe every relevant one?) # TODO add u-boot-qemu ? https://packages.debian.org/bullseye/u-boot-qemu (not sure which arches to add this to since it contains all of them... maybe every relevant one?)
} -}} } -}}
{{ if env.variant == "native" then ( -}} {{ if env.variant == "native" then ( -}}
arch="$(dpkg --print-architecture)"; \ arch="$(dpkg --print-architecture)"; \