diff mbox series

[v1,2/4] automation/: add Ubuntu:focal container

Message ID 42b2b80779e264d60fa3daf01110fece34f00696.1605636800.git.edvin.torok@citrix.com (mailing list archive)
State New, archived
Headers show
Series tools/ocaml/libs/xc: domid control at domain creation time | expand

Commit Message

Edwin Török Nov. 17, 2020, 6:24 p.m. UTC
Signed-off-by: Edwin Török <edvin.torok@citrix.com>
---
 automation/build/ubuntu/focal.dockerfile | 50 ++++++++++++++++++++++++
 automation/scripts/containerize          |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 automation/build/ubuntu/focal.dockerfile

Comments

Douglas Goldstein Nov. 18, 2020, 4:40 p.m. UTC | #1
On 11/17/20 12:24 PM, Edwin Török wrote:
> Signed-off-by: Edwin Török <edvin.torok@citrix.com>

Looks good. Do you have permissions to push the container or do you need
me to?

Acked-by: Doug Goldstein <cardoe@cardoe.com>
Edwin Török Nov. 18, 2020, 4:43 p.m. UTC | #2
On Wed, 2020-11-18 at 10:40 -0600, Doug Goldstein wrote:
> 
> 
> On 11/17/20 12:24 PM, Edwin Török wrote:
> > Signed-off-by: Edwin Török <edvin.torok@citrix.com>
> 
> Looks good. Do you have permissions to push the container or do you
> need
> me to?
> 
> Acked-by: Doug Goldstein <cardoe@cardoe.com>

Thanks, if you could push it that'd be great.
I don't have any special permissions on the gitlab registry.

Best regards,
--Edwin
Andrew Cooper Nov. 18, 2020, 5:57 p.m. UTC | #3
On 17/11/2020 18:24, Edwin Török wrote:
> Signed-off-by: Edwin Török <edvin.torok@citrix.com>
> ---
>  automation/build/ubuntu/focal.dockerfile | 50 ++++++++++++++++++++++++
>  automation/scripts/containerize          |  1 +
>  2 files changed, 51 insertions(+)
>  create mode 100644 automation/build/ubuntu/focal.dockerfile
>
> diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile
> new file mode 100644
> index 0000000000..1f014b67bc
> --- /dev/null
> +++ b/automation/build/ubuntu/focal.dockerfile
> @@ -0,0 +1,50 @@
> +FROM ubuntu:20.04
> +LABEL maintainer.name="The Xen Project " \
> +      maintainer.email="xen-devel@lists.xenproject.org"
> +
> +ENV DEBIAN_FRONTEND=noninteractive
> +ENV USER root
> +
> +RUN mkdir /build
> +WORKDIR /build
> +
> +# build depends
> +RUN apt-get update && \
> +    apt-get --quiet --yes install \
> +        build-essential \
> +        zlib1g-dev \
> +        libncurses5-dev \
> +        libssl-dev \
> +        python-dev \

Python2 is legacy in Focal, and shouldn't be necessary for 4.14 and later.

> +        python3-dev \
> +        xorg-dev \
> +        uuid-dev \
> +        libyajl-dev \
> +        libaio-dev \
> +        libglib2.0-dev \
> +        clang \
> +        libpixman-1-dev \
> +        pkg-config \
> +        flex \
> +        bison \
> +        gettext \
> +        acpica-tools \
> +        bin86 \
> +        bcc \
> +        liblzma-dev \
> +        libc6-dev-i386 \
> +        libnl-3-dev \
> +        ocaml-nox \
> +        libfindlib-ocaml-dev \
> +        libsystemd-dev \
> +        markdown \

We dropped markdown as a dependency a release or two ago.

Both these dependences should be fine to drop, if we're happy to not
role Focal testing out to all the older branches.

> +        transfig \
> +        pandoc \
> +        checkpolicy \
> +        wget \

The build has absolutely no business reaching out into the internet.

I'm tempted to forcibly clobber it in the main build script.  (Perhaps
this is best not conflated with the Focal change.)

~Andrew
diff mbox series

Patch

diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile
new file mode 100644
index 0000000000..1f014b67bc
--- /dev/null
+++ b/automation/build/ubuntu/focal.dockerfile
@@ -0,0 +1,50 @@ 
+FROM ubuntu:20.04
+LABEL maintainer.name="The Xen Project " \
+      maintainer.email="xen-devel@lists.xenproject.org"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+# build depends
+RUN apt-get update && \
+    apt-get --quiet --yes install \
+        build-essential \
+        zlib1g-dev \
+        libncurses5-dev \
+        libssl-dev \
+        python-dev \
+        python3-dev \
+        xorg-dev \
+        uuid-dev \
+        libyajl-dev \
+        libaio-dev \
+        libglib2.0-dev \
+        clang \
+        libpixman-1-dev \
+        pkg-config \
+        flex \
+        bison \
+        gettext \
+        acpica-tools \
+        bin86 \
+        bcc \
+        liblzma-dev \
+        libc6-dev-i386 \
+        libnl-3-dev \
+        ocaml-nox \
+        libfindlib-ocaml-dev \
+        libsystemd-dev \
+        markdown \
+        transfig \
+        pandoc \
+        checkpolicy \
+        wget \
+        git \
+        nasm \
+        && \
+        apt-get autoremove -y && \
+        apt-get clean && \
+        rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index ed991bb79c..94ff8b1ca8 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -29,6 +29,7 @@  case "_${CONTAINER}" in
     _centos7) CONTAINER="${BASE}/centos:7" ;;
     _centos72) CONTAINER="${BASE}/centos:7.2" ;;
     _fedora) CONTAINER="${BASE}/fedora:29";;
+    _focal) CONTAINER="${BASE}/ubuntu:focal" ;;
     _jessie) CONTAINER="${BASE}/debian:jessie" ;;
     _stretch|_) CONTAINER="${BASE}/debian:stretch" ;;
     _unstable|_) CONTAINER="${BASE}/debian:unstable" ;;