bug 1455061: upgrade update verify and funsize update generator docker images to newer ubuntu to get latest python. r=sfraser, a=release
authorBen Hearsum <bhearsum@mozilla.com>
Fri, 08 Jun 2018 14:31:05 -0400
changeset 806033 c7187146116fe90f3e98a7d7657fe5501faad472
parent 806032 d0564109d0e340caa7cdcf0e96aaa96b1feb0a09
child 806034 55bafed347183a1fbc13c8cc85fd6d0ae1b59838
push id112832
push userbballo@mozilla.com
push dateFri, 08 Jun 2018 21:11:22 +0000
reviewerssfraser, release
bugs1455061
milestone60.0.3
bug 1455061: upgrade update verify and funsize update generator docker images to newer ubuntu to get latest python. r=sfraser, a=release
taskcluster/docker/funsize-update-generator/Dockerfile
taskcluster/docker/update-verify/Dockerfile
--- a/taskcluster/docker/funsize-update-generator/Dockerfile
+++ b/taskcluster/docker/funsize-update-generator/Dockerfile
@@ -1,30 +1,30 @@
-FROM ubuntu:xenial
+FROM ubuntu:18.04
 MAINTAINER Simon Fraser <sfraser@mozilla.com>
 
 # Required software
 ENV DEBIAN_FRONTEND noninteractive
 # Chain apt-get commands with apt-get clean in a single docker RUN
 # to make sure that files are removed within a single docker layer
 RUN apt-get update -q && \
     apt-get install -yyq --no-install-recommends \
-    python3.5 python3-setuptools python3-cryptography libgetopt-simple-perl \
+    python3.6 python3-setuptools python3-cryptography libgetopt-simple-perl \
     bzip2 clamav clamav-freshclam python3-requests python3-sh curl \
-    python3-dev gcc liblzma-dev xz-utils jq && \
+    python3-dev gcc liblzma-dev xz-utils jq libdpkg-perl && \
     apt-get clean
 RUN useradd -d /home/worker -s /bin/bash -m worker
 COPY requirements.txt /tmp/
 
 # Freshclam may be flaky, retry if it fails
 RUN for i in 1 2 3 4 5; do freshclam --verbose && break || sleep 15; done
 
 # python-pip installs a lot of dependencies increasing the size of an image
-# drastically. Using easy_install saves us almost 200M.
-RUN easy_install3 pip
+# drastically. Install it like this saves us almost 200M.
+RUN bash -c "curl -L https://bootstrap.pypa.io/get-pip.py | python3"
 RUN pip install -r /tmp/requirements.txt
 
 # scripts
 RUN mkdir /home/worker/bin
 COPY scripts/* /home/worker/bin/
 
 COPY runme.sh /runme.sh
 COPY recompress.sh /recompress.sh
--- a/taskcluster/docker/update-verify/Dockerfile
+++ b/taskcluster/docker/update-verify/Dockerfile
@@ -1,12 +1,11 @@
-# Ideally we'd use LTS here, but 16.04 doesn't have a new enough
-# p7zip-full for us. We should change this to the next LTS
-# (18.04), once available
-FROM ubuntu:17.10
+# This is an LTS! We should upgrade after the next LTS is released, unless
+# we've switched to the in-tree debian base images by then.
+FROM ubuntu:18.04
 
 MAINTAINER release@mozilla.com
 
 RUN dpkg --add-architecture i386 && apt-get -q update \
     # p7zip-full is for extracting Windows and OS X packages
     # wget is for downloading update.xml, installers, and MARs
     # libgtk-3-0 and libgtk2.0-0 are required to run the Firefox updater
     && apt-get -q --yes install p7zip-full wget libgtk-3-0 libgtk-3.0:i386 libgtk2.0-0 libgtk2.0-0:i386 \