From 79886b9b5754f84fbf5e949c4bbc7530b8ddccca Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 4 Apr 2019 22:16:01 +0000 Subject: [PATCH] Bug 1541821 - Ensure docker images using setup_packages.sh are up-to-date wrt the packages provided there. r=tomprince When docker images use setup_packages.sh, they add apt sources. While we currently do run apt-get update to pick those new sources, if a package provided by them is already installed and not explicitly listed in subsequent apt-get install, they're not going to be upgraded. Differential Revision: https://phabricator.services.mozilla.com/D26100 --HG-- extra : moz-landing-system : lando --- taskcluster/docker/debian-base/Dockerfile | 1 + taskcluster/docker/debian-build/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/taskcluster/docker/debian-base/Dockerfile b/taskcluster/docker/debian-base/Dockerfile index 4336a7cc7e50..dc92ce3d882a 100644 --- a/taskcluster/docker/debian-base/Dockerfile +++ b/taskcluster/docker/debian-base/Dockerfile @@ -31,6 +31,7 @@ CMD ["/bin/bash", "--login"] # %ARG DOCKER_IMAGE_PACKAGES RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAGES && \ apt-get update && \ + apt-get dist-upgrade && \ apt-get install \ git \ less \ diff --git a/taskcluster/docker/debian-build/Dockerfile b/taskcluster/docker/debian-build/Dockerfile index fd1f5c0db0d6..5bf9fb2f1e6e 100644 --- a/taskcluster/docker/debian-build/Dockerfile +++ b/taskcluster/docker/debian-build/Dockerfile @@ -27,6 +27,7 @@ RUN dpkg --add-architecture $ARCH # use pkg-config, which is multiarch-aware, but we also need dpkg-dev because # of https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916772. RUN apt-get update && \ + apt-get dist-upgrade && \ echo path-exclude=/usr/share/doc/*/changelog.Debian* > /etc/dpkg/dpkg.cfg.d/excludes && \ if grep -q ^7\\. /etc/debian_version; then \ BACKPORT=/wheezy-backports; \