diff options
| author | Philippe Mathieu-Daudé | 2019-07-23 16:15:27 +0200 |
|---|---|---|
| committer | Alex Bennée | 2019-07-23 18:19:11 +0200 |
| commit | 98808c3d0c162aba93fe7840a34b54c4814332d4 (patch) | |
| tree | f260285ce6a8f0364958d3a518af667ecc0f30b2 /tests/docker/dockerfiles/debian-s390x-cross.docker | |
| parent | tests/qemu-iotests: Don't use 'seq' in the iotests (diff) | |
| download | qemu-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-s390x-cross.docker')
| -rw-r--r-- | tests/docker/dockerfiles/debian-s390x-cross.docker | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index e188bfeda4..6732f9ec78 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -10,19 +10,22 @@ RUN dpkg --add-architecture s390x # Grab the updated list of packages RUN apt update && apt dist-upgrade -yy -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-multilib-s390x-linux-gnu -RUN DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get build-dep -yy -a s390x qemu +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt build-dep -yy -a s390x qemu # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-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:s390x \ liblzo2-dev:s390x \ librdmacm-dev:s390x \ |