Skip to content

Commit 131433b

Browse files
authored
Update Ubuntu containers to install QEMU v11 and swtpm (#581)
This change updates the container image script to install QEMU v11. This change also installs `swtpm` rather than requiring the consumer pipeline to install it separately.
1 parent dd7434e commit 131433b

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

.sync/containers/Ubuntu-22/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ RUN update-alternatives \
200200
FROM build AS test
201201

202202
ARG QEMU_URL="https://gitlab.com/qemu-project/qemu.git"
203-
ARG QEMU_BRANCH="v10.0.0"
203+
ARG QEMU_BRANCH="v11.0.0"
204204

205205
RUN apt-get update && apt-get install --yes --no-install-recommends \
206206
autoconf \
@@ -216,6 +216,8 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
216216
libsdl2-dev \
217217
mtools \
218218
ninja-build \
219+
swtpm \
220+
swtpm-tools \
219221
tar \
220222
&& \
221223
pip3 install distlib && \

.sync/containers/Ubuntu-24/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ RUN update-alternatives \
202202
FROM build AS test
203203

204204
ARG QEMU_URL="https://gitlab.com/qemu-project/qemu.git"
205-
ARG QEMU_BRANCH="v10.0.0"
205+
ARG QEMU_BRANCH="v11.0.0"
206206

207207
RUN apt-get update && apt-get install --yes --no-install-recommends \
208208
autoconf \
@@ -218,6 +218,8 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
218218
libsdl2-dev \
219219
mtools \
220220
ninja-build \
221+
swtpm \
222+
swtpm-tools \
221223
tar \
222224
&& \
223225
git clone "${QEMU_URL}" --branch "${QEMU_BRANCH}" --depth 1 qemu && \

0 commit comments

Comments
 (0)