From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Petri Latvala <petri.latvala@intel.com>
Subject: [igt-dev] [PATCH i-g-t] Dockerfile: Use Fedora 31
Date: Wed, 30 Oct 2019 13:32:04 +0200 [thread overview]
Message-ID: <20191030113204.11018-1-arkadiusz.hiler@intel.com> (raw)
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: Arkadiusz Hiler <arkadiusz.hiler@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
+
# For the helpers for the container with IGT inside
RUN dnf install -y findutils
# 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 dnf clean all
--
2.21.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next reply other threads:[~2019-10-30 11:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 11:32 Arkadiusz Hiler [this message]
2019-10-30 11:47 ` [igt-dev] [PATCH i-g-t] Dockerfile: Use Fedora 31 Petri Latvala
2019-10-30 12:20 ` Arkadiusz Hiler
2019-10-30 12:24 ` Petri Latvala
2019-10-30 12:52 ` Arkadiusz Hiler
2019-10-30 12:17 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191030113204.11018-1-arkadiusz.hiler@intel.com \
--to=arkadiusz.hiler@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=petri.latvala@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox