Skip to content
Snippets Groups Projects
Commit 03c1c6e4 authored by Arkadiusz Hiler's avatar Arkadiusz Hiler
Browse files

Dockerfile: Use Fedora 31


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@intel.com>
Signed-off-by: default avatarArkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: default avatarPetri Latvala <petri.latvala@intel.com>
parent 922f28ad
No related branches found
No related tags found
No related merge requests found
Checking pipeline status
...@@ -84,7 +84,7 @@ build:tests-fedora-oldest-meson: ...@@ -84,7 +84,7 @@ build:tests-fedora-oldest-meson:
stage: build stage: build
script: script:
- dnf remove -y meson - dnf remove -y meson
- pip3 install /usr/src/meson-*.tar.gz - pip install /usr/src/meson-*.tar.gz
- meson $MESON_OPTIONS build - meson $MESON_OPTIONS build
- ninja -C build - ninja -C build
- ninja -C build igt-gpu-tools-doc - ninja -C build igt-gpu-tools-doc
......
FROM fedora:30 FROM fedora:31
RUN dnf install -y \ RUN dnf install -y \
gcc flex bison libatomic meson ninja-build xdotool \ gcc flex bison libatomic meson ninja-build xdotool \
...@@ -37,10 +37,14 @@ RUN rm -fr /tmp/peg ...@@ -37,10 +37,14 @@ RUN rm -fr /tmp/peg
# For compile-testing on clang # For compile-testing on clang
RUN dnf install -y clang RUN dnf install -y clang
# For test list comparison
RUN dnf install -y diffutils
# For the helpers for the container with IGT inside # For the helpers for the container with IGT inside
RUN dnf install -y findutils RUN dnf install -y findutils
# Meson version switching shenanigans # Meson version switching shenanigans
RUN dnf install -y python3-pip
RUN curl -o "/usr/src/#1" "https://files.pythonhosted.org/packages/e8/ec/3e6a68c9e0fd4b4f4fb6877a3ccfb6f6e6d09f2b4fc87674e671bf64b7b8/{meson-0.47.2.tar.gz}" RUN curl -o "/usr/src/#1" "https://files.pythonhosted.org/packages/e8/ec/3e6a68c9e0fd4b4f4fb6877a3ccfb6f6e6d09f2b4fc87674e671bf64b7b8/{meson-0.47.2.tar.gz}"
RUN dnf clean all RUN dnf clean all
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment