[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [XEN PATCH 1/2] automation: Adding ninja-build to some docker images
This is to allow building the latest version of QEMU. fedora/29: In addition to adding "ninja", I've add to make some other changes: some `go build` failed with `mkdir /.cache` no permission, so I've created a user. (this was discovered while testing the new container with the script containerize.) Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx> --- automation/build/alpine/3.12.dockerfile | 1 + automation/build/fedora/29.dockerfile | 9 ++++++--- automation/build/suse/opensuse-leap.dockerfile | 2 ++ automation/build/ubuntu/bionic.dockerfile | 2 ++ automation/build/ubuntu/focal.dockerfile | 2 ++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/automation/build/alpine/3.12.dockerfile b/automation/build/alpine/3.12.dockerfile index bb8e5ece7414..4ee3ddc12e52 100644 --- a/automation/build/alpine/3.12.dockerfile +++ b/automation/build/alpine/3.12.dockerfile @@ -47,6 +47,7 @@ RUN \ apk add glib-dev && \ apk add libattr && \ apk add libcap-ng-dev && \ + apk add ninja && \ apk add pixman-dev && \ \ # cleanup diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedora/29.dockerfile index 027b93ceaf4e..60a5d722668f 100644 --- a/automation/build/fedora/29.dockerfile +++ b/automation/build/fedora/29.dockerfile @@ -2,9 +2,6 @@ FROM fedora:29 LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx" -RUN mkdir /build -WORKDIR /build - # install Xen depends RUN dnf -y install \ clang \ @@ -43,5 +40,11 @@ RUN dnf -y install \ ocaml \ ocaml-findlib \ golang \ + # QEMU + ninja-build \ && dnf clean all && \ rm -rf /var/cache/dnf + +RUN useradd --create-home user +USER user +WORKDIR /build diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile index 573fbd8ae47e..03f8a7acad4f 100644 --- a/automation/build/suse/opensuse-leap.dockerfile +++ b/automation/build/suse/opensuse-leap.dockerfile @@ -67,5 +67,7 @@ RUN zypper install -y --no-recommends \ which \ xz-devel \ zlib-devel \ + # QEMU + ninja \ && \ zypper clean -a diff --git a/automation/build/ubuntu/bionic.dockerfile b/automation/build/ubuntu/bionic.dockerfile index 406a97494caf..1e5a27c70f15 100644 --- a/automation/build/ubuntu/bionic.dockerfile +++ b/automation/build/ubuntu/bionic.dockerfile @@ -45,6 +45,8 @@ RUN apt-get update && \ wget \ git \ nasm \ + # QEMU + ninja-build \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile index 952a3172aa64..74655b9876d2 100644 --- a/automation/build/ubuntu/focal.dockerfile +++ b/automation/build/ubuntu/focal.dockerfile @@ -44,6 +44,8 @@ RUN apt-get update && \ wget \ git \ nasm \ + # QEMU + ninja-build \ && \ apt-get autoremove -y && \ apt-get clean && \ -- Anthony PERARD
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |