Bug 1291365 - Install tooltool securely in ubuntu1204-test image; r=dustin
authorGregory Szorc <gps@mozilla.com>
Tue, 02 Aug 2016 12:28:15 -0700
changeset 308681 dba9f54f051241cab84429c8b98ea881f6d982c3
parent 308680 df3c13ea7d3eef0d751d2c020bb4d90c3dbdbc1e
child 308682 51ac9d25dbe9ca0e7306ab767e59dfeeb77090c5
push id80407
push usercbook@mozilla.com
push dateTue, 09 Aug 2016 13:48:02 +0000
treeherdermozilla-inbound@99f20b0c58d0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1291365
milestone51.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 1291365 - Install tooltool securely in ubuntu1204-test image; r=dustin More determinism. More security. More reliable. Vendoring. The path to the installed tooltool.py has also been changed to /setup for consistency with other images. MozReview-Commit-ID: JnUS35AyPus
testing/docker/ubuntu1204-test/Dockerfile
testing/docker/ubuntu1204-test/system-setup.sh
--- a/testing/docker/ubuntu1204-test/Dockerfile
+++ b/testing/docker/ubuntu1204-test/Dockerfile
@@ -1,14 +1,17 @@
 FROM          ubuntu:12.04
 MAINTAINER    Jonas Finnemann Jensen <jopsen@gmail.com>
 
 RUN useradd -d /home/worker -s /bin/bash -m worker
 WORKDIR /home/worker
 
+# %include testing/docker/recipes/tooltool.py
+ADD topsrcdir/testing/docker/recipes/tooltool.py /setup/tooltool.py
+
 # install non-build specific dependencies in a single layer
 ADD           system-setup.sh   /tmp/system-setup.sh
 RUN           bash /tmp/system-setup.sh
 
 # Set variable normally configured at login, by the shells parent process, these
 # are taken from GNU su manual
 ENV           HOME          /home/worker
 ENV           SHELL         /bin/bash
--- a/testing/docker/ubuntu1204-test/system-setup.sh
+++ b/testing/docker/ubuntu1204-test/system-setup.sh
@@ -119,18 +119,16 @@ apt_packages+=('python-pip')
 
 apt-get update
 # This allows ubuntu-desktop to be installed without human interaction
 export DEBIAN_FRONTEND=noninteractive
 apt-get install -y --force-yes ${apt_packages[@]}
 
 dpkg-reconfigure locales
 
-# set up tooltool (temporarily)
-curl https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py > /setup/tooltool.py
 tooltool_fetch() {
     cat >manifest.tt
     python /setup/tooltool.py fetch
     rm manifest.tt
 }
 
 # install peep
 tooltool_fetch <<'EOF'