[igt-dev] [PATCH i-g-t] Dockerfile: Use Fedora 31

Petri Latvala petri.latvala at intel.com
Wed Oct 30 11:47:36 UTC 2019


On Wed, Oct 30, 2019 at 01:32:04PM +0200, Arkadiusz Hiler wrote:
> Update to the newest version.
> 
> Python 3 is now the default one, so we can drop the suffix from pip
> invocation and we have to install it explicitly.
> 
> Cc: Petri Latvala <petri.latvala at intel.com>
> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
> ---
>  .gitlab-ci.yml          | 2 +-
>  Dockerfile.build-fedora | 6 +++++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index d465c79a..9873f9c3 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -84,7 +84,7 @@ build:tests-fedora-oldest-meson:
>    stage: build
>    script:
>      - dnf remove -y meson
> -    - pip3 install /usr/src/meson-*.tar.gz
> +    - pip install /usr/src/meson-*.tar.gz
>      - meson $MESON_OPTIONS build
>      - ninja -C build
>      - ninja -C build igt-gpu-tools-doc
> diff --git a/Dockerfile.build-fedora b/Dockerfile.build-fedora
> index ce50376f..dc5d1b16 100644
> --- a/Dockerfile.build-fedora
> +++ b/Dockerfile.build-fedora
> @@ -1,4 +1,4 @@
> -FROM fedora:30
> +FROM fedora:31
>  
>  RUN dnf install -y \
>  	gcc flex bison libatomic meson ninja-build xdotool \
> @@ -37,10 +37,14 @@ RUN rm -fr /tmp/peg
>  # For compile-testing on clang
>  RUN dnf install -y clang
>  
> +# For test list comparison
> +RUN dnf install -y diffutils
> +

How was this previously installed?


>  # For the helpers for the container with IGT inside
>  RUN dnf install -y findutils
>  
>  # Meson version switching shenanigans
> +RUN dnf install -y python3-pip

Or this?


Did the default set just change?



-- 
Petri Latvala


More information about the igt-dev mailing list