diff options
| author | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2019-08-30 11:29:13 +0300 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2019-08-30 12:52:27 +0300 |
| commit | 522bab4503db480dddd1985c9976bc0a6e6da986 (patch) | |
| tree | b190f1e016831e5c7e348f80afd24a296ebed2f7 | |
| parent | c06ee2989c012fcc43cd361e75e9ee5a3a9292df (diff) | |
Dockerfile: Avoid touching external resources
Let's install all the necessary things in the build-* images, so we
don't touch/hammer external servers each time there is a small change in
IGT.
We have already seen this failing:
Error: Error downloading packages:
Status code: 503 for https://mirrors.fedoraproject.org/metalink?repo=fedora-30&arch=x86_64
The command '/bin/sh -c dnf install -y findutils && dnf clean all' returned a non-zero code: 1
Cc: Oleg Vasilev <oleg.vasilev@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | Dockerfile.build-fedora | 3 |
2 files changed, 3 insertions, 3 deletions
@@ -1,9 +1,6 @@ # Version number to bump for force image rebuild: 0 FROM build-fedora -RUN dnf install -y findutils && \ - dnf clean all - COPY opt-igt /opt/igt COPY .gitlab-ci/docker-help.sh /usr/local/bin/docker-help.sh diff --git a/Dockerfile.build-fedora b/Dockerfile.build-fedora index fa27a623..4ccaadd1 100644 --- a/Dockerfile.build-fedora +++ b/Dockerfile.build-fedora @@ -37,6 +37,9 @@ RUN rm -fr /tmp/peg # For compile-testing on clang RUN dnf install -y clang +# For the helpers for the container with IGT inside +RUN dnf install -y findutils + # Meson version switching shenanigans WORKDIR /usr/src RUN curl -O https://files.pythonhosted.org/packages/c0/9b/44cdb8adcbb186be6cba5c93718d0c68f177b0e8082ae00cafa63a1d3535/meson-0.47.0.tar.gz |