Bug 1541821 - Ensure docker images using setup_packages.sh are up-to-date wrt the packages provided there. r=tomprince
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 04 Apr 2019 22:16:01 +0000
changeset 468288 97fa367562a0f8faa9a3413f24a6542b16407c5d
parent 468287 0c2d3df59443feb80498c1f555e0c3321c2c649b
child 468289 7d60a7fd2fac0ac7427666f2d857aeba128cc6d0
push id35828
push usercbrindusan@mozilla.com
push dateSun, 07 Apr 2019 09:34:50 +0000
treeherdermozilla-central@7d60a7fd2fac [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince
bugs1541821
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
taskcluster/docker/debian-base/Dockerfile
taskcluster/docker/debian-build/Dockerfile
--- a/taskcluster/docker/debian-base/Dockerfile
+++ b/taskcluster/docker/debian-base/Dockerfile
@@ -26,16 +26,17 @@ ENV HOME=/builds/worker \
 
 # Set a default command useful for debugging
 CMD ["/bin/bash", "--login"]
 
 # %ARG TASKCLUSTER_ROOT_URL
 # %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 \
       make \
       mercurial \
       patch \
       python \
       python3.5 \
--- a/taskcluster/docker/debian-build/Dockerfile
+++ b/taskcluster/docker/debian-build/Dockerfile
@@ -22,16 +22,17 @@ RUN dpkg --add-architecture $ARCH
 # between i386 and amd64 variants of the packages we build on automation
 # because of dates stored in them by debchange (and both might end up installed
 # in some cases).
 # On Debian 7, pkg-config was not multiarch-aware, so we rely on the $ARCH
 # pkg-config being valid on the host. On more recent versions of Debian, we can
 # 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; \
       PKG_CONFIG=pkg-config:$ARCH; \
     else \
       PKG_CONFIG="pkg-config dpkg-dev"; \
     fi && \
     apt-get install \