summaryrefslogtreecommitdiffstats
path: root/tests/docker/dockerfiles/debian-mips-cross.docker
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2019-07-23 16:15:27 +0200
committerAlex Bennée2019-07-23 18:19:11 +0200
commit98808c3d0c162aba93fe7840a34b54c4814332d4 (patch)
treef260285ce6a8f0364958d3a518af667ecc0f30b2 /tests/docker/dockerfiles/debian-mips-cross.docker
parenttests/qemu-iotests: Don't use 'seq' in the iotests (diff)
downloadqemu-98808c3d0c162aba93fe7840a34b54c4814332d4.tar.gz
qemu-98808c3d0c162aba93fe7840a34b54c4814332d4.tar.xz
qemu-98808c3d0c162aba93fe7840a34b54c4814332d4.zip
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-mips-cross.docker')
-rw-r--r--tests/docker/dockerfiles/debian-mips-cross.docker16
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/docker/dockerfiles/debian-mips-cross.docker
index 550f43281b..3c4d6f9ec1 100644
--- a/tests/docker/dockerfiles/debian-mips-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips-cross.docker
@@ -9,20 +9,22 @@ MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
# Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture mips
-RUN apt-get update
-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 \
gcc-mips-linux-gnu
-RUN DEBIAN_FRONTEND=noninteractive eatmydata \
- apt-get build-dep -yy -a mips qemu
+RUN apt update && \
+ DEBIAN_FRONTEND=noninteractive eatmydata \
+ apt build-dep -yy -a mips qemu
# Specify the cross prefix for this image (see tests/docker/common.rc)
ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips-linux-gnu-
# Install extra libraries to increase code coverage
-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:mips \
liblzo2-dev:mips \
librdmacm-dev:mips \