diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-07-23 16:15:27 +0200 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2019-07-23 17:19:11 +0100 |
| commit | 98808c3d0c162aba93fe7840a34b54c4814332d4 (patch) | |
| tree | f260285ce6a8f0364958d3a518af667ecc0f30b2 /tests/docker/dockerfiles/debian-amd64.docker | |
| parent | 30edd9fa50e86fbf40c780bf47d7cb214e6f8438 (diff) | |
tests/docker: Refresh APT cache before installing new packages on Debian
Since docker caches the different layers, updating the package
list does not invalidate the previous "apt-get update" layer,
and it is likely "apt-get install" hits an outdated repository.
See commit beac6a98f6eb and
https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#apt-get
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190723141528.18023-1-philmd@redhat.com>
[AJB: manually applies and fixed up]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/dockerfiles/debian-amd64.docker')
| -rw-r--r-- | tests/docker/dockerfiles/debian-amd64.docker | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index d770a11a52..431e947ebd 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -7,11 +7,13 @@ FROM qemu:debian9 MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> -RUN DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get build-dep -yy qemu +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt build-dep -yy qemu -RUN DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get install -y --no-install-recommends \ +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ libbz2-dev \ liblzo2-dev \ librdmacm-dev \ @@ -19,8 +21,9 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ libvte-dev # virgl -RUN DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get install -y --no-install-recommends \ +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ libegl1-mesa-dev \ libepoxy-dev \ libgbm-dev @@ -29,8 +32,9 @@ RUN git clone https://anongit.freedesktop.org/git/virglrenderer.git /usr/src/vir RUN cd /usr/src/virglrenderer && ./autogen.sh && ./configure --with-glx --disable-tests && make install # netmap -RUN DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get install -y --no-install-recommends \ +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ linux-headers-amd64 RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap RUN cd /usr/src/netmap && git checkout v11.3 |